diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 5d42100..ffea64a 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -431,6 +431,31 @@ class ogAdmClientWorker (ogLiveWorker): return {} #exit (0) ## ogAdmClient.c:905 + def do_Comando (self, post_params): + for k in ['nfn', 'ids']: + if k not in post_params: + logger.error (f'required parameter ({k}) not in POST params') + return {} + + nfn = post_params['nfn'] + ids = post_params['ids'] + + try: + self.interfaceAdmin (nfn) + herror = 0 + except: + logger.warning ('Error al ejecutar el comando') + herror = 1 + + cmd = { + 'nfn': 'RESPUESTA_Comando', + } + return self.respuestaEjecucionComando (cmd, herror, ids) + + def process_Comando (self, path, get_params, post_params, server): + logger.debug ('in process_Comando, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) + return self._long_running_job ('Comando', self.do_Comando, args=(post_params,)) + def process_Sondeo (self, path, get_params, post_params, server): logger.debug ('in process_Sondeo, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) return {} ## ogAdmClient.c:920 @@ -443,7 +468,7 @@ class ogAdmClientWorker (ogLiveWorker): logger.error (f'required parameter ({k}) not in POST params') return {} - nfn = unquote (post_params['nfn']) + nfn = post_params['nfn'] scp = unquote (post_params['scp']) filescript = f'/tmp/_script_{self.IPlocal}' ecosrc = f'/tmp/_econsola_{self.IPlocal}' diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 8fb02e9..e2e948b 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -68,9 +68,9 @@ class ogLiveWorker(ServerWorker): ''' if parametros: - proc = ['bash', '-c', '{} set -x; bash -x {} {}; set +x'.format (devel_bash_prefix, exe, ' '.join (parametros))] + proc = ['bash', '-c', '{} bash -x {} {}'.format (devel_bash_prefix, exe, ' '.join (parametros))] else: - proc = ['bash', '-c', '{} set -x; bash -x {}; set +x'.format (devel_bash_prefix, exe)] + proc = ['bash', '-c', '{} bash -x {}'.format (devel_bash_prefix, exe)] logger.debug ('subprocess.run ("{}", capture_output=True)'.format (proc)) p = subprocess.run (proc, capture_output=True) ## DEBUG