bugfix monitoring => now seems ok

Etienne Pallier
1 parent 873ac998
Showing 6 changed files with 24 additions and 6 deletions Show diff stats
simulators/telescope/telescopeSimulator.py
src/core/pyros_django/devices/Device.py
src/core/pyros_django/monitoring/TelescopeMonitoring.py
src/core/pyros_django/monitoring/plc_checker.py
src/core/pyros_django/monitoring/start_agent_telescope_monitoring.py
src/core/pyros_django/pyros/settings.py
+#!/usr/bin/env python3
+
 import os
 import sys
 import time
@@ -21,7 +21,7 @@ class DeviceController():
     logger = L.setupLogger("DeviceLogger", "Devices")
     name = ""
     #config_file = "../config/socket_config.ini"
-    config_file = "config/socket_config.ini"
+    config_file = "../../../../config/socket_config.ini"
     config = None
     connected = False
     sock = None
@@ -7,8 +7,8 @@ import os
 import sys
  
 '''
-    THIS IS A PROTOTYPE ! Its does not use the RemoteControlClass which convert the command to specific grammar,
-    it need to be implemented
+    THIS IS A PROTOTYPE ! It does not use the RemoteControlClass which convert the command to specific grammar,
+    it needs to be implemented
  
  
     Agent which turn in an infinite loop and watch the database looking for requests to execute, it will be also used for
@@ -54,7 +54,8 @@ class PlcChecker(object):
             _struct["origin"] = self.origin
             _struct["sensors"] = self.sensors_table
             _struct["selected_sensors"] = self.sensors_weather
-            _file = open("./src/monitoring/plc_config.json" , 'w')
+            #_file = open("./src/monitoring/plc_config.json" , 'w')
+            _file = open("./plc_config.json" , 'w')
             _file.write(json.dumps(_struct))
             _file.close()
             logger.info("Saved : plc_config.json")
@@ -5,11 +5,16 @@ import sys
  
 # DJANGO setup
 #sys.path.append('/PROJECTS/GFT/SOFT/PYROS_SOFT/PYROS201802')
+# In order to find all pyros django modules (dashboard, ...) :
 sys.path.append('..')
+#sys.path.append("../..")
+#sys.path.append("../../..")
+# In order to find the src/ folder :
+sys.path.append("../../../..")
 # Go into src/
-os.chdir('..')
+#os.chdir('../')
 #print("Current directory : " + str(os.getcwd()))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.pyros.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.core.pyros_django.pyros.settings")
 #os.environ['SECRET_KEY'] = 'abc'
 #os.environ['ENVIRONMENT'] = 'production'
 import django
@@ -162,6 +162,16 @@ if MYSQL:
             'NAME': 'pyros',
             'USER': 'pyros',
             'PASSWORD': 'DjangoPyros',
+            ''' 
+                (See https://docs.djangoproject.com/fr/2.1/topics/testing/overview/#the-test-database)
+                Optional, but this allows to remember the default django test database name 
+                (and even to rename it if needed).
+                For this DB, you need to do this in mysql :
+                GRANT ALL PRIVILEGES ON test_pyros.* TO 'pyros_user'@'localhost';
+            '''
+            'TEST': {
+                'NAME': 'test_pyros',
+            },
         }
     }