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

Merge pull request 'fixes-win' (#13) from fixes-win into main 

Reviewed-on: #13
lgromero-filebeat 1.4.4
Natalia Serrano 2024-10-30 11:58:36 +01:00
parent 324ffdaffc 4c789b6f43
commit b7b2a58186
7 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linux/debian/changelog
View File

@ -1,3 +1,10 @@
ogagent (1.4.4-1) stable; urgency=medium
* Use logger.debug() to prevent the windows agent from dying
* Make status() call synchronous
-- OpenGnsys developers <info@opengnsys.es> Thu, 17 Oct 2024 19:13:58 +0200
ogagent (1.4.3-1) stable; urgency=medium ogagent (1.4.3-1) stable; urgency=medium
* Use new OGBrowser * Use new OGBrowser

21
src/OGAgentUser.py
View File

@ -210,7 +210,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
valid_mods.append(mod) valid_mods.append(mod)
except Exception as e: except Exception as e:
logger.exception() logger.exception()
logger.error("Activation of {} failed: {}".format(mod.name, utils.exceptionToMessage(e))) logger.debug ("Activation of {} failed: {}".format(mod.name, utils.exceptionToMessage(e)))
self.modules[:] = valid_mods # copy instead of assignment self.modules[:] = valid_mods # copy instead of assignment
# If this is running, it's because he have logged in, inform service of this fact # If this is running, it's because he have logged in, inform service of this fact
self.ipc.sendLogin((operations.getCurrentUser(), operations.getSessionLanguage(), self.ipc.sendLogin((operations.getCurrentUser(), operations.getSessionLanguage(),
@ -223,7 +223,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
mod.deactivate() mod.deactivate()
except Exception as e: except Exception as e:
logger.exception() logger.exception()
logger.error("Deactivation of {} failed: {}".format(mod.name, utils.exceptionToMessage(e))) logger.debug ("Deactivation of {} failed: {}".format(mod.name, utils.exceptionToMessage(e)))
def timerFnc(self): def timerFnc(self):
pass pass
@ -236,7 +236,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
logger.debug('msg: {}, {}'.format(type(msg), msg)) logger.debug('msg: {}, {}'.format(type(msg), msg))
module, message, data = msg module, message, data = msg
except Exception as e: except Exception as e:
logger.error('Got exception {} processing message {}'.format(e, msg)) logger.debug ('Got exception {} processing message {}'.format(e, msg))
return return
for v in self.modules: for v in self.modules:
@ -246,9 +246,9 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
v.processMessage(message, json.loads(data)) v.processMessage(message, json.loads(data))
return return
except Exception as e: except Exception as e:
logger.error('Got exception {} processing generic message on {}'.format(e, v.name)) logger.debug ('Got exception {} processing generic message on {}'.format(e, v.name))
logger.error('Module {} not found, messsage {} not sent'.format(module, message)) logger.debug ('Module {} not found, messsage {} not sent'.format(module, message))
## when is this run?? ## when is this run??
def executeScript(self, script): def executeScript(self, script):
@ -271,7 +271,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
self.deinitialize() self.deinitialize()
except Exception: except Exception:
logger.exception() logger.exception()
logger.error('Got exception deinitializing modules') logger.debug ('Got exception deinitializing modules')
try: try:
# If we close Client, send Logoff to Broker # If we close Client, send Logoff to Broker
@ -282,10 +282,7 @@ class OGASystemTray(QtWidgets.QSystemTrayIcon):
except Exception: except Exception:
# May we have lost connection with server, simply log and exit in that case # May we have lost connection with server, simply log and exit in that case
logger.exception() logger.exception()
# File "/home/nati/Downloads/work/opengnsys/ogagent/src/OGAgentUser.py", line 286, in cleanup logger.debug ('Got an exception, processing quit')
# logger.exception("Got an exception, processing quit")
#TypeError: Logger.exception() takes 1 positional argument but 2 were given
#logger.exception("Got an exception, processing quit")
try: try:
# operations.logoff() # Uncomment this after testing to logoff user # operations.logoff() # Uncomment this after testing to logoff user
@ -319,7 +316,7 @@ if __name__ == '__main__':
trayIcon = OGASystemTray(app) trayIcon = OGASystemTray(app)
except Exception as e: except Exception as e:
logger.exception() logger.exception()
logger.error('OGA Service is not running, or it can\'t contact with OGA Server. User Tools stopped: {}'.format( logger.debug ('OGA Service is not running, or it can\'t contact with OGA Server. User Tools stopped: {}'.format(
utils.exceptionToMessage(e))) utils.exceptionToMessage(e)))
sys.exit(1) sys.exit(1)
@ -327,7 +324,7 @@ if __name__ == '__main__':
trayIcon.initialize() # Initialize modules, etc.. trayIcon.initialize() # Initialize modules, etc..
except Exception as e: except Exception as e:
logger.exception() logger.exception()
logger.error('Exception initializing OpenGnsys User Agent {}'.format(utils.exceptionToMessage(e))) logger.debug ('Exception initializing OpenGnsys User Agent {}'.format(utils.exceptionToMessage(e)))
trayIcon.quit() trayIcon.quit()
sys.exit(1) sys.exit(1)

2
src/VERSION
View File

@ -1 +1 @@
1.4.3 1.4.4

10
src/opengnsys/httpserver.py
View File

@ -96,22 +96,22 @@ class HTTPServerHandler(BaseHTTPRequestHandler):
logger.exception() logger.exception()
n_args = len (e.args) n_args = len (e.args)
if 0 == n_args: if 0 == n_args:
logger.error ('Empty exception raised from message processor for "{}"'.format(path[0])) logger.debug ('Empty exception raised from message processor for "{}"'.format(path[0]))
self.sendJsonError(500, exceptionToMessage(e)) self.sendJsonError(500, exceptionToMessage(e))
else: else:
arg0 = e.args[0] arg0 = e.args[0]
if type (arg0) is str: if type (arg0) is str:
logger.error ('Message processor for "{}" returned exception string "{}"'.format(path[0], str(e))) logger.debug ('Message processor for "{}" returned exception string "{}"'.format(path[0], str(e)))
self.sendJsonError (500, exceptionToMessage(e)) self.sendJsonError (500, exceptionToMessage(e))
elif type (arg0) is dict: elif type (arg0) is dict:
if '_httpcode' in arg0: if '_httpcode' in arg0:
logger.warning ('Message processor for "{}" returned HTTP code "{}" with exception string "{}"'.format(path[0], str(arg0['_httpcode']), str(arg0['_msg']))) logger.debug ('Message processor for "{}" returned HTTP code "{}" with exception string "{}"'.format(path[0], str(arg0['_httpcode']), str(arg0['_msg'])))
self.sendJsonError (arg0['_httpcode'], arg0['_msg']) self.sendJsonError (arg0['_httpcode'], arg0['_msg'])
else: else:
logger.error ('Message processor for "{}" returned exception dict "{}" with no HTTP code'.format(path[0], str(e))) logger.debug ('Message processor for "{}" returned exception dict "{}" with no HTTP code'.format(path[0], str(e)))
self.sendJsonError (500, exceptionToMessage(e)) self.sendJsonError (500, exceptionToMessage(e))
else: else:
logger.error ('Message processor for "{}" returned non-string and non-dict exception "{}"'.format(path[0], str(e))) logger.debug ('Message processor for "{}" returned non-string and non-dict exception "{}", type "{}"'.format(path[0], str(e), type(e)))
self.sendJsonError (500, exceptionToMessage(e)) self.sendJsonError (500, exceptionToMessage(e))
## not reached ## not reached

4
src/opengnsys/modules/server/OpenGnSys/__init__.py
View File

@ -65,7 +65,7 @@ def check_secret(fnc):
else: else:
raise Exception('Unauthorized operation') raise Exception('Unauthorized operation')
except Exception as e: except Exception as e:
logger.error(str(e)) logger.debug (str(e))
raise Exception(e) raise Exception(e)
return wrapper return wrapper
@ -83,7 +83,7 @@ def execution_level(level):
else: else:
raise Exception('Unauthorized operation') raise Exception('Unauthorized operation')
except Exception as e: except Exception as e:
logger.error(str(e)) logger.debug (str(e))
raise Exception(e) raise Exception(e)
return wrapper return wrapper

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

@ -306,7 +306,9 @@ class ogAdmClientWorker (ogLiveWorker):
logger.info ('onActivation ok') logger.info ('onActivation ok')
def do_status (self, post_params): @check_secret
def process_status (self, path, get_params, post_params, server):
logger.debug ('in process_status, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
cfg = self.LeeConfiguracion() cfg = self.LeeConfiguracion()
thr_status = {} thr_status = {}
for k in self.thread_list: for k in self.thread_list:
@ -322,11 +324,6 @@ class ogAdmClientWorker (ogLiveWorker):
'threads': thr_status, 'threads': thr_status,
} }
@check_secret
def process_status (self, path, get_params, post_params, server):
logger.debug ('in process_status, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))
return self._long_running_job ('status', self.do_status, args=(post_params,))
@check_secret @check_secret
def process_popup (self, path, get_params, post_params, server): def process_popup (self, path, get_params, post_params, server):
logger.debug ('in process_popup, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) logger.debug ('in process_popup, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server))

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

@ -139,7 +139,7 @@ class ogLiveWorker(ServerWorker):
def notifier (self, result): def notifier (self, result):
logger.debug (f'notifier() called, result ({result})') logger.debug (f'notifier() called, result ({result})')
res = self.REST.sendMessage ('/'.join ([self.name, 'callback']), result) res = self.REST.sendMessage ('/clients/status/webhook', result)
def mon (self): def mon (self):
while True: while True: