Renommé script start_agent_X en start_agent générique pour tout agent

Il n'y a plus besoin des scripts start_agent de chaque app

Renommé script start_agent_X en start_agent générique pour tout agent
Il n'y a plus besoin des scripts start_agent de chaque app
Etienne Pallier
1 parent a5f1e984
Showing 6 changed files with 60 additions and 87 deletions Show diff stats
pyros2
src/devices/Device.py
src/majordome/start_agent_majordome.py
src/monitoring/start_agent_monitoring.py
src/monitoring/tasks.py
start_agent_agentX.py -> start_agent.py
@@ -285,14 +285,22 @@ def start(agent:str, configfile:str):
         if agent in ("all", agent_name) :
  
             # Default case, launch agentX
-            if agent_name == "agentX":
-                # execProcessFromVenvAsync(VENV_BIN + " manage.py runserver")
-                print(VENV_BIN)
-                print("Launching agent", agent_name, "...")
-                #if not test_mode(): execProcess(VENV_BIN + " manage.py runserver")
-                if not test_mode(): execProcessFromVenv("start_agent_" + agent_name + ".py " + configfile)
-                # self.changeDirectory("..")
+            #if agent_name == "agentX":
+
+            # execProcessFromVenvAsync(VENV_BIN + " manage.py runserver")
+            print(VENV_BIN)
+            print("Launching agent", agent_name, "...")
+            #if not test_mode(): execProcess(VENV_BIN + " manage.py runserver")
+            #if not test_mode(): execProcessFromVenv("start_agent_" + agent_name + ".py " + configfile)
+            cmd = "start_agent.py " + agent_name + " " + configfile
+            if agent_name == "webserver": 
+                cmd = "manage.py runserver"
+                os.chdir("src")
+            #if not test_mode(): execProcessFromVenv("start_agent.py " + agent_name + " " + configfile)
+            if not test_mode(): execProcessFromVenv(cmd)
+            # self.changeDirectory("..")
  
+            '''
             # Any other agent
             else:
                 # Go into src/
@@ -314,6 +322,7 @@ def start(agent:str, configfile:str):
                 # Go back to src/
                 # self.changeDirectory('..')
                 os.chdir("..")
+            '''
  
     # Go back to root folder (/)
     # self.changeDirectory('..')
@@ -20,7 +20,8 @@ class DeviceController():
     __metaclass__ = abc.ABCMeta
     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
@@ -28,7 +29,10 @@ class DeviceController():
     port = None
  
     def __init__(self, device_name):
+        print("DeviceController:__init__()")
         self.name = device_name
+        print("device name", device_name)
+        print(os.getcwd())
         self.getConfig()
         self.getConnection(device_name)
         self.connect()
@@ -142,6 +146,7 @@ class DeviceController():
         return message
  
     def getConnection(self, device_name):
+        #print("device_name", device_name)
         self.ip = self.config.get(device_name, "ip")
         self.port = int(self.config.get(device_name, "port"))
         return (0)
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-from django.conf import settings as djangosettings
-
-FOR_REAL = True
-if len(sys.argv) == 2 and sys.argv[1] == "test":
-    FOR_REAL = False
-print("FOR_REAL is", FOR_REAL)
-
-# To avoid a "ModuleNotFoundError: No module named 'dashboard'"... (not even 1 app found) :
-sys.path.insert(0, os.path.abspath(".."))
-# To avoid a "ModuleNotFoundError: No module named 'src'"
-sys.path.append("..")
-print("Starting with this sys.path", sys.path)
-
-# DJANGO setup
-# print("file is", __file__)
-# mypath = os.getcwd()
-# Go into src/
-os.chdir("..")
-# print("Current directory : " + str(os.getcwd()))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.pyros.settings")
-# os.environ['SECRET_KEY'] = 'abc'
-# os.environ['ENVIRONMENT'] = 'production'
-import django
-
-django.setup()
-
-print("DB2 used is:", djangosettings.DATABASES["default"]["NAME"])
-
-
-# MONITORING AGENT setup
-agent = "majordome"
-
-if agent == "majordome":
-    from majordome.tasks import Majordome
-
-    # Run agent Majordome without actual commands sent to devices (FOR_REAL=False)
-    Majordome().run(FOR_REAL)
@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-# To avoid a "ModuleNotFoundError: No module named 'dashboard'"... (not even 1 app found) :
-sys.path.insert(0, os.path.abspath(".."))
-# To avoid a "ModuleNotFoundError: No module named 'src'"
-sys.path.append('..')
-print("Starting with this sys.path", sys.path)
-
-# DJANGO SETUP
-# Go into src/
-os.chdir('..')
-#print("Current directory : " + str(os.getcwd()))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.pyros.settings")
-#os.environ['SECRET_KEY'] = 'abc'
-#os.environ['ENVIRONMENT'] = 'production'
-import django
-django.setup()
-
-#import datetime
-#print(datetime.datetime.now())
-
-# MONITORING agent setup
-#agent="monitoring"
-#if agent=="monitoring":
-from monitoring.tasks import Monitoring
-Monitoring().run()
@@ -45,14 +45,14 @@ class Monitoring():
         # (non blocking if could not connect)
         self.setContext()
         print ("AGENT ENV: config PLC is (ip={}, port={})".format(self.plcController.ip, self.plcController.port))
-        
+
         # (EP) self.setTime()
         self.setTimers()
         print("AGENT ENV: my timers (check env status every {}s, check other agents every {}s)".format(self.timer_status, self.timer_tasks))
-        
+
         self.setTasks()
         print("AGENT ENV: Other Agents id read from DB (majordome={}, alert={})".format(self.majordome_task, self.alert_task))
-        
+
         self.loop()
  
  
@@ -5,15 +5,29 @@ import sys
  
 from django.conf import settings as djangosettings
  
+AGENTS = {
+    "agentX" : "AgentX", 
+    "webserver" : "webserver", 
+    "monitoring" : "monitoring", 
+    "majordome" : "majordome", 
+    "scheduler" : "scheduler", 
+    "alert_manager" : "alert_manager"
+}
  
 configfile = None
-if len(sys.argv) == 2:
-    configfile = sys.argv[1]
  
-# from AgentX import AgentX
+if len(sys.argv) < 2:
+    print("Error: you must give an agent name to start")
+    exit(1)
+
+# arg 1 : agent name
+agent_name = sys.argv[1]
  
+# arg 2 : config file
+if len(sys.argv) == 3:
+    configfile = sys.argv[1]
  
-# Préconisé sur le net:
+# Conseil sur le net:
 #https://stackoverflow.com/questions/16853649/how-to-execute-a-python-script-from-the-django-shell
 """
 import sys, os
@@ -31,7 +45,7 @@ TODO:
 - thread de run
 - thread de wrapper
 - gestion des commandes dans le run
-- table dédiée à l'agent, infos dynamiques volatiles
+- table dediee à l agent, infos dynamiques volatiles
 """
  
  
@@ -64,8 +78,23 @@ print(&quot;DB2 used is:&quot;, djangosettings.DATABASES[&quot;default&quot;][&quot;NAME&quot;])
 print()
  
  
-from src.agent.AgentX import AgentX
+if agent_name not in AGENTS: 
+    print("Error: this agent does not exists")
+    sys.exit(1)
  
+if agent_name == "majordome":
+    from src.majordome.tasks import Majordome
+    Majordome().run(FOR_REAL=True)
+    sys.exit(0)
+
+if agent_name == "monitoring":
+    from src.monitoring.tasks import Monitoring
+    Monitoring().run()
+    sys.exit(0)
+
+# Default agent is AgentX
+
+from src.agent.AgentX import AgentX
 # AgentX().run(FOR_REAL=False)
 agentx = AgentX(name="agentX", config_filename=configfile)