From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 2 Feb 2009 18:42:14 +0000 (+0000)
Subject: The logger message was preventing modules from running if/when the API was unavailable.
X-Git-Tag: NodeManager-1.7-43~2
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=343fa4d2fc581c04aa7018f8e6aa2664091e22c8

The logger message was preventing modules from running if/when the API was unavailable.
---

diff --git a/nm.py b/nm.py
index 744ba76..e9ca6d6 100755
--- a/nm.py
+++ b/nm.py
@@ -56,13 +56,14 @@ def GetSlivers(plc, config):
         logger.log("Syncing w/ PLC")
         data = plc.GetSlivers()
         getPLCDefaults(data, config)
+        if (options.verbose): logger.log_slivers(data)
     except: 
         logger.log_exc()
         #  XXX So some modules can at least boostrap.
+        logger.log("nm:  Can't contact PLC to GetSlivers().  Continuing.")
         data = {}
-    if (options.verbose):
-        logger.log_slivers(data)
-    # Set i2 ip list for nodes in I2 nodegroup.
+    # Set i2 ip list for nodes in I2 nodegroup
+    # and init network interfaces (unless overridden)
     try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods.
     except: logger.log_exc()
     #  All other callback modules