winservice fix

agent-winservice.py

@@ -27,11 +27,12 @@ logger.info("%s loaded", __file__)
 class AppServerSvc (win32serviceutil.ServiceFramework):
     _svc_name_ = "circle-agent"
     _svc_display_name_ = "CIRCLE Agent"
+    _svc_desciption_ = "CIRCLE cloud contextualization agent"
 
     def __init__(self, args):
         win32serviceutil.ServiceFramework.__init__(self, args)
         self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
-        socket.setdefaulttimeout(60)
+        socket.setdefaulttimeout(120)
 
     def SvcStop(self):
         self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
@@ -40,15 +41,25 @@ class AppServerSvc (win32serviceutil.ServiceFramework):
         logger.info("%s stopped", __file__)
 
     def SvcDoRun(self):
+        logger.info("%s starting", __file__)
+        cnt = 3
+        while cnt > 0:
+            try:
                 servicemanager.LogMsg(servicemanager.EVENTLOG_INFORMATION_TYPE,
                                 servicemanager.PYS_SERVICE_STARTED,
                                 (self._svc_name_, ''))
-        logger.info("%s starting", __file__)
+                break
+            except Exception as e:
+                logger.exception("Servicemanager busy?", e) 
+                cnt -= 1
+        if cnt:
+            logger.info("Starting agent_main")
             agent_main()
 
 
 def main():
-    if len(sys.argv) == 1: # never happen set 1 for debugging!!!!
+    logger.info("Started: %s", sys.argv)
+    if len(sys.argv) == 1:
         # service must be starting...
         # for the sake of debugging etc, we use win32traceutil to see
         # any unhandled exceptions and print statements.

watchdog-winservice.py

@@ -31,13 +31,21 @@ def watch():
     def start_service():
         win32serviceutil.StartService(service_name)
 
+    timo_base = 10
+    timo = timo_base
     while True:
         if not check_service(service_name):
             logger.info("Service %s is not running.", service_name)
+            try:
                 start_service()
+                timo = timo_base
+                logger.info("Service %s started.", service_name)
+            except Exception as e:
+                timo *= 2
+                logger.exception("Cant start service %s new timo: %s" % (service_name, timo))
         if stopped:
             return
-        sleep(10)
+        sleep(timo)
 
 
 class AppServerSvc (win32serviceutil.ServiceFramework):
@@ -65,7 +73,8 @@ class AppServerSvc (win32serviceutil.ServiceFramework):
 
 
 def main():
-    if len(sys.argv) == 1: # never happen set 1 for debugging!!!!
+    logger.info("Started: %s", sys.argv)
+    if len(sys.argv) == 1:
         # service must be starting...
         # for the sake of debugging etc, we use win32traceutil to see
         # any unhandled exceptions and print statements.