remove call to non-existent close() function

diff --git a/bwmon.py b/bwmon.py
index baee9be..b6f5697 100755 (executable)
--- a/bwmon.py
+++ b/bwmon.py
@@ -14,7 +14,7 @@
 # Andy Bavier <acb@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
 # Andy Bavier <acb@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #

-# $Id: bwmon.py,v 1.1 2006/04/28 19:11:20 mlhuang Exp $
+# $Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $

 #
 
 import syslog
 #
 
 import syslog


@@ -273,11 +273,11 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file

-        if version != "$Id: bwmon.py,v 1.1 2006/04/28 19:11:20 mlhuang Exp $":
+        if version != "$Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $":

             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:
             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:

-        version = "$Id: bwmon.py,v 1.1 2006/04/28 19:11:20 mlhuang Exp $"
+        version = "$Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $"

         slices = {}
 
     # Get special slice IDs
         slices = {}
 
     # Get special slice IDs


@@ -329,9 +329,6 @@ def main():
     for xid in dead:
         del slices[xid]
 
     for xid in dead:
         del slices[xid]
 

-    # Close connection to Node Manager
-    nm.close()
-

     if verbose:
         print "Saving %s" % datafile
     f = open(datafile, "w")
     if verbose:
         print "Saving %s" % datafile
     f = open(datafile, "w")

diff --git a/pl_mom.py b/pl_mom.py
index 532dfd5..d332717 100644 (file)
--- 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
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #

-# $Id$
+# $Id: pl_mom.py,v 1.1 2006/04/28 19:27:43 mlhuang Exp $

 #
 
 import os
 #
 
 import os


@@ -179,14 +179,6 @@ class NM:
             print "Warning: Exception received while opening connection to Node Manager:", err
             self.nm = None
 
             print "Warning: Exception received while opening connection to Node Manager:", err
             self.nm = None
 

-    def close(self):
-        """
-        Close connection to the local Node Manager
-        """
-
-        if self.nm is not None:
-            self.nm.close()
-

     def query(self, slice, attributes):
         """
         Get values of various slice attributes from the local Node Manager
     def query(self, slice, attributes):
         """
         Get values of various slice attributes from the local Node Manager