X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=RunlevelAgent.py;fp=RunlevelAgent.py;h=5865b63f74cef440c3d490566395ac80340d9e60;hp=04dcfeef447c74019c7637a15d01faeb2de71e31;hb=bf3ad61643e7dfb5aeb19f26e18486b3060724b1;hpb=45c45cc6ae12eb7863612ab833b0facbfb2c37bb

diff --git a/RunlevelAgent.py b/RunlevelAgent.py
index 04dcfee..5865b63 100644
--- a/RunlevelAgent.py
+++ b/RunlevelAgent.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # RunlevelAgent - acts as a heartbeat back to myplc reporting that the node is
-# 	online and whether it is in boot or pre-boot run-level.
+#     online and whether it is in boot or pre-boot run-level.
 #   This is useful to identify nodes that are behind a firewall, as well as to
 #   have the machine report run-time status both in safeboot and boot modes,
 #   so that it is immediately visible at myplc (gui or api).
@@ -96,12 +96,21 @@ def check_running(commandname):
 
 def main():
 
-    f=open(SESSION_FILE,'r')
-    session_str=f.read().strip()
-    api = PLC(Auth(session=session_str), api_server_url)
-    # NOTE: What should we do if this call fails?
-	# TODO: handle dns failure here.
-    api.AuthCheck()
+    # Keep trying to authenticate session, waiting for NM to re-write the
+    # session file, or DNS to succeed, until AuthCheck succeeds.
+    while True:
+        try:
+            f=open(SESSION_FILE,'r')
+            session_str=f.read().strip()
+            api = PLC(Auth(session=session_str), api_server_url)
+            # NOTE: What should we do if this call fails?
+            # TODO: handle dns failure here.
+            api.AuthCheck()
+            break
+        except:
+            print "Retry in 30 seconds: ", os.popen("uptime").read().strip()
+            traceback.print_exc()
+            time.sleep(30)
 
     try:
         env = 'production'
@@ -115,7 +124,7 @@ def main():
             # NOTE: here we are inferring the runlevel by environmental
             #         observations.  We know how this process was started by the
             #         given command line argument.  Then in bootmanager
-            #         runlevle, the bm.log gives information about the current
+            #         runlevel, the bm.log gives information about the current
             #         activity.
             # other options:
             #   call plc for current boot state?