git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b9bd0e
)
The logger message was preventing modules from running if/when the API was unavailable.
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 2 Feb 2009 18:42:14 +0000
(18:42 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 2 Feb 2009 18:42:14 +0000
(18:42 +0000)
nm.py
patch
|
blob
|
history
diff --git
a/nm.py
b/nm.py
index
744ba76
..
e9ca6d6
100755
(executable)
--- 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)
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.
except:
logger.log_exc()
# XXX So some modules can at least boostrap.
+ logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.")
data = {}
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
try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods.
except: logger.log_exc()
# All other callback modules