diff --git a/src/opengnsys/RESTApi.py b/src/opengnsys/RESTApi.py index 3abcfc9..a59630e 100644 --- a/src/opengnsys/RESTApi.py +++ b/src/opengnsys/RESTApi.py @@ -58,8 +58,12 @@ class ConnectionError(RESTError): # Disable warnings log messages try: import urllib3 # @UnusedImport + requests_log = logging.getLogger ('urllib3') + requests_log.setLevel (logging.INFO) except Exception: from requests.packages import urllib3 # @Reimport + requests_log = logging.getLogger ('requests.packages.urllib3') + requests_log.setLevel (logging.INFO) try: urllib3.disable_warnings() # @UndefinedVariable @@ -148,7 +152,9 @@ class REST(object): raise Exception (f'response content-type is not "application/json" but "{ct}"') r = json.loads(r.content) # Using instead of r.json() to make compatible with old requests lib versions except requests.exceptions.RequestException as e: - raise ConnectionError(e) + code = e.response.status_code + logger.warning (f'request failed, HTTP code "{code}"') + return None except Exception as e: raise ConnectionError(exceptionToMessage(e)) @@ -160,13 +166,13 @@ class REST(object): @param data: if None or omitted, message will be a GET, else it will send a POST @param processData: if True, data will be serialized to json before sending, else, data will be sent as "raw" """ - logger.debug('Invoking post message {} with data {}'.format(msg, data)) + #logger.debug('Invoking post message {} with data {}'.format(msg, data)) if processData and data is not None: data = json.dumps(data) url = self._getUrl(msg) - logger.debug('Requesting {}'.format(url)) + #logger.debug('Requesting {}'.format(url)) try: res = self._request(url, data) diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 0347dad..78a7883 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -198,7 +198,7 @@ class ogLiveWorker(ServerWorker): progress = None for i in ary: if m := re.search (r'^\[([0-9]+)\]', i): ## look for strings like '[10]', '[60]' - logger.debug (f"matched regex, m.groups ({m.groups()})") + #logger.debug (f"matched regex, m.groups ({m.groups()})") progress = float (m.groups()[0]) / 100 return progress @@ -211,7 +211,7 @@ class ogLiveWorker(ServerWorker): for k in self.thread_list: elem = self.thread_list[k] if 'thread' not in elem: continue - logger.debug (f'considering thread ({k})') + #logger.debug (f'considering thread ({k})') if self.pid_q: if not self.pid_q.empty(): @@ -240,11 +240,20 @@ class ogLiveWorker(ServerWorker): time.sleep (1) n += 1 if not n % 10: + alive_threads = [] + for k in self.thread_list: + elem = self.thread_list[k] + if 'thread' not in elem: continue + alive_threads.append (k) + if alive_threads: + s = ','.join (alive_threads) + logger.debug (f'alive threads: {s}') + body = { 'iph': self.IPlocal, 'timestamp': int (time.time()), } - logger.debug (f'about to send ping ({body})') + #logger.debug (f'about to send ping ({body})') self.REST.sendMessage ('clients/status/webhook', body) def interfaceAdmin (self, method, parametros=[]): @@ -277,7 +286,8 @@ class ogLiveWorker(ServerWorker): self.pid_q.put (p.pid) else: ## esto sucede por ejemplo cuando arranca el agente, que estamos en interfaceAdmin() en el mismo hilo, sin _long_running_job ni hilo separado - logger.debug ('no queue--not writing any PID to it') + #logger.debug ('no queue--not writing any PID to it') + pass sout = serr = '' while p.poll() is None: @@ -293,12 +303,12 @@ class ogLiveWorker(ServerWorker): serr = serr.strip() ## DEBUG - logger.info (f'stdout follows:') + logger.debug (f'stdout follows:') for l in sout.splitlines(): - logger.info (f' {l}') - logger.info (f'stderr follows:') - for l in serr.splitlines(): - logger.info (f' {l}') + logger.debug (f' {l}') + #logger.debug (f'stderr follows:') + #for l in serr.splitlines(): + # logger.debug (f' {l}') ## /DEBUG if 0 != p.returncode: cmd_txt = ' '.join (proc) @@ -337,9 +347,7 @@ class ogLiveWorker(ServerWorker): res = self.REST.sendMessage ('/'.join ([self.name, path]), obj) if (type (res) is not dict): - #logger.error ('No se ha podido establecer conexión con el Servidor de Administración') ## Error de conexión con el servidor - logger.debug (f'res ({res})') - logger.error ('Error al enviar trama ***send() fallo') + logger.error (f'response is not a dict ({res})') return False return res @@ -366,9 +374,7 @@ class ogLiveWorker(ServerWorker): p = subprocess.Popen (['/usr/bin/browser', '-qws', url]) try: p.wait (2) ## if the process dies before 2 seconds... - logger.error ('Error al ejecutar la llamada a la interface de administración') - logger.error ('Error en la creación del proceso hijo') - logger.error ('return code "{}"'.format (p.returncode)) + logger.error ('Error al ejecutar browser, return code "{}"'.format (p.returncode)) return False except subprocess.TimeoutExpired: pass @@ -388,7 +394,7 @@ class ogLiveWorker(ServerWorker): logger.error (e) logger.error ('No se ha podido recuperar la dirección IP del cliente') return None - logger.debug ('parametroscfg ({})'.format (parametroscfg)) + #logger.debug ('parametroscfg ({})'.format (parametroscfg)) return parametroscfg def cfg2obj (self, cfg):