X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pl_mom.py;h=6d4d8bfcf145f21670f0f7360257a884bdd302f6;hb=7aca3983cb46f3e88d2873cd1935622e61c10223;hp=51cb34e28fbd8b416c5269c1fc7d70c75de07af7;hpb=cc74f4314f465de81a5e9a0bc6b31bb19b13346a;p=mom.git

diff --git a/pl_mom.py b/pl_mom.py
index 51cb34e..6d4d8bf 100644
--- a/pl_mom.py
+++ b/pl_mom.py
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: pl_mom.py,v 1.3 2006/05/09 03:22:25 mlhuang Exp $
+# $Id: pl_mom.py,v 1.5 2006/07/10 15:19:35 faiyaza Exp $
 #
 
 import os
@@ -86,7 +86,7 @@ def removepid(prog):
     os.unlink("/var/run/%s.pid" % prog)
 
 def slicemail(slice, subject, body):
-    sendmail = os.popen("/usr/sbin/sendmail -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w")
+    sendmail = os.popen("/usr/sbin/sendmail -N never -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w")
 
     # PLC has a separate list for pl_mom messages
     if PLC_MAIL_SUPPORT_ADDRESS == "support@planet-lab.org":
@@ -167,11 +167,10 @@ class NM:
     Simple interface to local Node Manager API
     """
 
-    def __init__(self, url = "http://localhost:812/", timeout = 10):
+    def __init__(self, url = "http://localhost:812/", timeout = 30):
         """
         Open a new connection to the local Node Manager
         """
-
         socket.setdefaulttimeout(timeout)
         try:
             self.nm = xmlrpclib.ServerProxy(url)
@@ -190,8 +189,7 @@ class NM:
         values = [attribute[1] for attribute in attributes]
 
         if self.nm is not None:
-            try:
-                # Read rspec (the NM hash code for the slice)
+		# Read rspec (the NM hash code for the slice)
                 rcap = open("/var/run/pl_nm/%s.vm_rcap" % slice, "r")
                 rspec = rcap.readline().strip()
                 rcap.close()
@@ -199,7 +197,4 @@ class NM:
                 (rc, result) = self.nm.nm_inspect(rspec, attributes)
 		if rc == 0 and type(result) == list and len(result) == len(values):
 		    values = result
-            except Exception, err:
-                print "Warning: Exception received while querying Node Manager:", err
-
         return values