more entries in gitignore for lower noise

[plcapi.git] / PLC / Boot.py

diff --git a/PLC/Boot.py b/PLC/Boot.py
index cd3a738..0f1bc28 100644 (file)
--- a/PLC/Boot.py
+++ b/PLC/Boot.py
@@ -4,11 +4,9 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2007 The Trustees of Princeton University
 #
-# $Id$
-#
 
 from PLC.Faults import *
-from PLC.Debug import log
+from PLC.Logger import logger
 from PLC.Messages import Message, Messages
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites
@@ -19,7 +17,7 @@ def notify_owners(method, node, message_id,
                   fault = None):
     messages = Messages(method.api, [message_id], enabled = True)
     if not messages:
-        print >> log, "No such message template '%s'" % message_id
+        logger.error("No such message template '%s'" % message_id)
         return 1
     message = messages[0]
 
@@ -35,13 +33,13 @@ def notify_owners(method, node, message_id,
     if include_pis or include_techs:
         sites = Sites(method.api, [node['site_id']])
         if not sites:
-            raise PLCAPIError, "No site associated with node"
+            raise PLCAPIError("No site associated with node")
         site = sites[0]
 
         persons = Persons(method.api, site['person_ids'])
         for person in persons:
-            if include_pis and 'pi' in person['roles'] or \
-               include_techs and 'tech' in person['roles']:
+            if (include_pis and 'pi' in person['roles'] and person['enabled']) or \
+               (include_techs and 'tech' in person['roles'] and person['enabled']) :
                 To.append(("%s %s" % (person['first_name'], person['last_name']), person['email']))
 
     # Send email