git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wrap open() with try/except
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
ed5309e
..
5531554
100755
(executable)
--- a/
nm.py
+++ b/
nm.py
@@
-85,7
+85,11
@@
def getPLCDefaults(data, config):
if len(attr_dict):
logger.verbose("Found default slice overrides.\n %s" % attr_dict)
config.OVERRIDES = attr_dict
if len(attr_dict):
logger.verbose("Found default slice overrides.\n %s" % attr_dict)
config.OVERRIDES = attr_dict
- elif 'OVERRIDES' in dir(config): del config.OVERRIDES
+ return
+ # NOTE: if an _default slice existed, it would have been found above and
+ # the routine would return. Thus, if we've gotten here, then no default
+ # slice is bound to this node.
+ if 'OVERRIDES' in dir(config): del config.OVERRIDES
def run():
def run():
@@
-134,6
+138,7
@@
def run():
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
#check auth
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
#check auth
+ logger.log("Checking Auth.")
while plc.check_authentication() != True:
try:
plc.update_session()
while plc.check_authentication() != True:
try:
plc.update_session()
@@
-141,6
+146,7
@@
def run():
except:
logger.log("Retry Failed. Waiting")
time.sleep(iperiod)
except:
logger.log("Retry Failed. Waiting")
time.sleep(iperiod)
+ logger.log("Authentication Succeeded!")
while True:
while True: