From 313a01396c591996b8fc14b82895b10039bcf732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C5=BEe=20=C5=BDitnik?= <anze.zitnik@xlab.si>
Date: Fri, 10 Dec 2021 13:34:37 +0100
Subject: [PATCH] Logging all exceptions
---
scheduler/scheduler.py | 4 ++--
wazuh_evidence_collector/wazuh_evidence_collector.py | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/scheduler/scheduler.py b/scheduler/scheduler.py
index 01f5ad0..db872c1 100644
--- a/scheduler/scheduler.py
+++ b/scheduler/scheduler.py
@@ -24,8 +24,8 @@ remove_jobs(scheduler)
# TODO: Change cron expression and repeat value for production verion.
# Should probably be "0 0 * * * ".
scheduler.cron(
- '* * * * * ',
- func=wazuh_evidence_collector.run_collector,
+ '* * * * * ',
+ func=wazuh_evidence_collector.main,
args=[],
repeat=None,
queue_name=CONSTANTS['redis']['queue'],
diff --git a/wazuh_evidence_collector/wazuh_evidence_collector.py b/wazuh_evidence_collector/wazuh_evidence_collector.py
index fb73fc3..bc6a87a 100644
--- a/wazuh_evidence_collector/wazuh_evidence_collector.py
+++ b/wazuh_evidence_collector/wazuh_evidence_collector.py
@@ -49,6 +49,12 @@ def get_tool_id():
return version
+def main():
+ try:
+ run_collector()
+ except BaseException as e:
+ LOGGER.exception("Exception caught in run_collector()")
+
# Wrapper function that runs all the checks (for every manager/agent)
def run_collector():
@@ -201,4 +207,4 @@ def generate_evidence(wc, es, agent):
return create_evidence(get_id(), "evidence_collector_service", get_tool_id(), raw_evidence, resource)
if __name__ == "__main__":
- run_collector()
\ No newline at end of file
+ main()
\ No newline at end of file
--
GitLab