Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Alain Klotz
2 parents 1d298020 0eaf1aa9
Showing 6 changed files with 16 additions and 7 deletions Show diff stats
simulators/logconf/logging.ini
simulators/plc/colibri-new-fixed-2.json
simulators/plc/guitalens_worker.py
simulators/plc/plcSimulator.py
src/dashboard/templates/dashboard/config_weather.html
src/monitoring/plc_checker.py
@@ -22,7 +22,7 @@ args=(&#39;../../logs/guitalens.log&#39;, &#39;a&#39;)
  
 [handler_consoleHandler]
 class=StreamHandler
-level=INFO
+level=DEBUG
 formatter=simpleFormaters
 args=(sys.stdout,)
  
@@ -137,7 +137,7 @@
       "entities": [
         {
           "entity_name": "PLC_STATUS",
-          "from": "Beckhoff",
+          "origin": "Beckhoff",
           "version_firmware": "20170809",
           "site": "OSM-Mexico",
           "date": "2017-03-03T13:45:00",
@@ -90,7 +90,7 @@ class WorkerUrl(threading.Thread):
     def set_values(self, ret):
         # cant replace object
         self.msg_struct['entity_name'] = ret['entity_name']
-        self.msg_struct['from'] = ret['from']
+        self.msg_struct['origin'] = ret['origin']
         self.msg_struct['version_firmware'] = ret['version_firmware']
         self.msg_struct['site'] = ret['site']
         self.msg_struct['date'] = ret['date']
@@ -4,6 +4,7 @@ import os
 import sys
 import json
 import time
+import logging
 import urllib.request
  
 DEBUG_FILE = True
@@ -11,6 +12,11 @@ PACKAGE_PARENT = &#39;..&#39;
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
  
+#(_path = os.path.abspath("..")
+#(sys.path.insert(0, _path )
+import logconf
+logger = logging.getLogger(__name__)
+
 #(EP renamed) from utils.Device import Device
 from utils.DeviceSim import DeviceSim
 from utils.StatusManager import StatusManager
@@ -121,10 +127,12 @@ class PLCSimulator(DeviceSim, StatusManager):
         self.my_worker = WorkerUrl(self.my_state, self.status)
         self.my_worker.start()
         self.my_state.status = 'init'
+        logger.info('Enter loop_3')
         while (self.my_state.worker == 'start'):
             if (self.isConnected()):
                     self.handleConnections()
             time.sleep(0.5)
+        logger.info('Exit loop_3')
         self.my_state.worker == 'stop'
  
     def loop_2(self):
@@ -4,7 +4,7 @@
  
     <div class="row">
  
-        <h1 id="none">Weather config for {{weather_config.origin.plc_from}} {{weather_config.origin.plc_site}}</h1>
+        <h1 id="none">Weather config for {{weather_config.origin.plc_origin}} {{weather_config.origin.plc_site}}</h1>
  
     <div class="well">
         Captors list:
@@ -10,7 +10,7 @@ class PlcChecker(object):
  
     def __init__(self):
         self.origin = {}
-        self.origin["plc_from"] = None
+        self.origin["plc_origin"] = None
         self.origin["plc_site"] = None
         self.struct = None
         self.path_list = None
@@ -81,11 +81,12 @@ class PlcChecker(object):
  
     def same_origin(self):
         # check new origin
-        if self.struct["from"] == self.origin["plc_from"] and self.struct["site"] == self.origin["plc_site"]:
+        print('?')
+        if self.struct["origin"] == self.origin["plc_origin"] and self.struct["site"] == self.origin["plc_site"]:
             return True
         else:
             # update origin
-            self.origin["plc_from"] = self.struct["from"]
+            self.origin["plc_origin"] = self.struct["origin"]
             self.origin["plc_site"] = self.struct["site"]
             # init sensors_monitor
             self.init_sensors_monitor()