Beremiz_service.py
changeset 1988 19ca02e8074f
parent 1987 8d1aca3c9e83
child 1994 1fdc32be71b8
--- a/Beremiz_service.py	Fri Apr 13 00:29:52 2018 +0200
+++ b/Beremiz_service.py	Sat Apr 14 10:09:33 2018 +0200
@@ -411,11 +411,11 @@
         self.port = port
         self.workdir = workdir
         self.argv = argv
-        self.plcobj = None
         self.servicepublisher = None
         self.statuschange = statuschange
         self.evaluator = evaluator
         self.pyruntimevars = pyruntimevars
+        self.plcobj = PLCObject(self)
 
     def _to_be_published(self):
         return self.servicename is not None and \
@@ -465,9 +465,6 @@
             self.plcobj.UnLoadPLC()
         self._stop()
 
-    def RegisterPLCObject(self, plcobj):
-        self.plcobj = plcobj
-
     def _stop(self):
         if self.plcobj is not None:
             self.plcobj.StopPLC()
@@ -476,6 +473,14 @@
             self.servicepublisher = None
         self.daemon.shutdown(True)
 
+    def AutoLoad(self):
+        self.plcobj.AutoLoad()
+        if self.plcobj.GetPLCstatus()[0] == "Stopped":
+            if autostart:
+                self.plcobj.StartPLC()
+        self.plcobj.StatusChange()
+
+
 
 if enabletwisted:
     import warnings
@@ -626,14 +631,6 @@
         except Exception:
             LogMessageAndException(_("WAMP client startup failed. "))
 
-plcobj = PLCObject(pyroserver)
-
-plcobj.AutoLoad()
-if plcobj.GetPLCstatus()[0] == "Stopped":
-    if autostart:
-        plcobj.StartPLC()
-plcobj.StatusChange()
-
 pyro_thread = Thread(target=pyroserver.PyroLoop)
 pyro_thread.start()
 
@@ -653,7 +650,7 @@
     ui_thread.start()
 
 try:
-    MainWorker.runloop()
+    MainWorker.runloop(pyroserver.AutoLoad)
 except KeyboardInterrupt:
     pass