opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1107 run one monitoring thread, not two

ogcore1
Natalia Serrano 2024-11-06 13:23:11 +01:00
parent 66b6ea4fc4
commit b8733fea49
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opengnsys/modules/server/CloningEngine/__init__.py
View File

@ -42,7 +42,7 @@ class CloningEngineWorker (ogLiveWorker):
REST = None # REST object REST = None # REST object
def onActivation (self): def onActivation (self):
super().onActivation() super().onActivation (run_monitoring_thread=False)
logger.info ('onActivation ok') logger.info ('onActivation ok')
def onDeactivation (self): def onDeactivation (self):

2
src/opengnsys/modules/server/ogAdmClient/__init__.py
View File

@ -279,7 +279,7 @@ class ogAdmClientWorker (ogLiveWorker):
#} #}
def onActivation (self): def onActivation (self):
super().onActivation() super().onActivation (run_monitoring_thread=True)
logger.info ('Inicio de sesion') logger.info ('Inicio de sesion')
logger.info ('Abriendo sesión en el servidor de Administración') logger.info ('Abriendo sesión en el servidor de Administración')
if (not self.inclusionCliente()): if (not self.inclusionCliente()):

3
src/opengnsys/workers/oglive_worker.py
View File

@ -288,7 +288,7 @@ class ogLiveWorker(ServerWorker):
return obj return obj
def onActivation (self): def onActivation (self, run_monitoring_thread):
if not os.path.exists ('/scripts/oginit'): if not os.path.exists ('/scripts/oginit'):
## no estamos en oglive, este modulo no debe cargarse ## no estamos en oglive, este modulo no debe cargarse
## esta lógica la saco de src/opengnsys/linux/operations.py, donde hay un if similar ## esta lógica la saco de src/opengnsys/linux/operations.py, donde hay un if similar
@ -322,6 +322,7 @@ class ogLiveWorker(ServerWorker):
if not self.tomaMAClocal(): if not self.tomaMAClocal():
raise Exception ('Se han generado errores. No se puede continuar la ejecución de este módulo') raise Exception ('Se han generado errores. No se puede continuar la ejecución de este módulo')
if run_monitoring_thread: ## should be true for exactly one ogLiveWorker
threading.Thread (name='monitoring_thread', target=self.mon, daemon=True).start() threading.Thread (name='monitoring_thread', target=self.mon, daemon=True).start()
def _long_running_job (self, name, f, args): def _long_running_job (self, name, f, args):