omdnotificationforwarder 4.3__tar.gz → 4.4__tar.gz

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdnotificationforwarder
-Version: 4.3
+Version: 4.4
 Summary: A framework for notification scripts for OMD
 Project-URL: Homepage, https://github.com/lausser/noteventificationforhandlerwarder
 Project-URL: Bug Tracker, https://github.com/lausser/noteventificationforhandlerwarder/issues

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/bin/notificationforwarder

@@ -78,7 +78,7 @@ Example for an HTTP-based reporter:
                       help='Logger type: text (default) or json, or custom logger module',
                       default='text')
     parser.add_argument('--version', action='version',
-                      version=f'%(prog)s 4.3')
+                      version=f'%(prog)s 4.4')
 
     args = parser.parse_args()
     if not hasattr(args, 'formatter'):

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/pyproject.toml

@@ -21,7 +21,7 @@ packages = ["src/notificationforwarder"]
 
 [project]
 name = "omdnotificationforwarder"
-version = "4.3"
+version = "4.4"
 authors = [
   { name="Gerhard Lausser", email="lausser@yahoo.com" },
 ]

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/src/notificationforwarder/baseclass.py

@@ -415,6 +415,7 @@ class NotificationForwarder(object):
         with open(self.db_lock_file, "w") as lock_file:
             locked = self.acquire_lock_with_retry(lock_file)
             if locked:
+                self.baseclass_logs_summary = True
                 try:
                     dropped = self.spool_store.prune_expired(self.max_spool_minutes)
                     replay_attempted = 0
@@ -449,7 +450,14 @@ class NotificationForwarder(object):
                             for id, text in id_events:
                                 raw_event = self.spool_store.decode(text)
                                 formatted_event = self.format_event(raw_event)
-                                if formatted_event:
+                                if formatted_event and formatted_event.is_discarded:
+                                    deleted_trash += 1
+                                    logger.info("discard spooled event during replay", {
+                                        'event_id': id,
+                                        'action': 'discard_during_replay'
+                                    })
+                                    self.spool_store.delete(id)
+                                elif formatted_event:
                                     replay_attempted += 1
                                     try:
                                         result = self.submit(formatted_event)

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/src/notificationforwarder/email/forwarder.py

@@ -5,6 +5,8 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from notificationforwarder.baseclass import NotificationForwarder, NotificationFormatter, timeout
 
+logger = logging.getLogger("notificationforwarder.email")
+
 class EmailForwarder(NotificationForwarder):
     def __init__(self, opts):
         super(self.__class__, self).__init__(opts)
@@ -31,6 +33,6 @@ class EmailForwarder(NotificationForwarder):
             server.quit()
             return True
         except Exception as e:
-            logging.critical("sending mail failed: {}".format(str(e)))
+            logger.critical("sending mail failed: {}".format(str(e)))
             return False
 

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/src/notificationforwarder/spool.py

@@ -4,6 +4,7 @@ except ImportError:
     import json
 import random
 import sqlite3
+import threading
 import time
 import fcntl
 
@@ -14,6 +15,7 @@ class SpoolStore:
         self.table_name = table_name
         self.connection = None
         self.cursor = None
+        self._lock = threading.Lock()
 
     def open(self):
         self.connection = sqlite3.connect(self.db_file, check_same_thread=False)
@@ -25,45 +27,53 @@ class SpoolStore:
                 payload TEXT NOT NULL,
                 timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
             )"""
-        self.cursor.execute(sql_create)
-        self.connection.commit()
+        with self._lock:
+            self.cursor.execute(sql_create)
+            self.connection.commit()
 
     def count(self):
-        self.cursor.execute("SELECT COUNT(*) FROM " + self.table_name)
-        return self.cursor.fetchone()[0]
+        with self._lock:
+            self.cursor.execute("SELECT COUNT(*) FROM " + self.table_name)
+            return self.cursor.fetchone()[0]
 
     def enqueue(self, raw_event):
         sql_insert = "INSERT INTO " + self.table_name + "(payload) VALUES (?)"
-        self.cursor.execute(sql_insert, (json.dumps(raw_event),))
-        self.connection.commit()
+        with self._lock:
+            self.cursor.execute(sql_insert, (json.dumps(raw_event),))
+            self.connection.commit()
 
     def prune_expired(self, max_spool_minutes):
         outdated = int(time.time() - 60 * max_spool_minutes)
         sql_delete = "DELETE FROM " + self.table_name + " WHERE CAST(STRFTIME('%s', timestamp) AS INTEGER) < ?"
-        self.cursor.execute(sql_delete, (outdated,))
-        return self.cursor.rowcount
+        with self._lock:
+            self.cursor.execute(sql_delete, (outdated,))
+            return self.cursor.rowcount
 
     def fetch_batch(self, limit=10):
         sql_select = "SELECT id, payload FROM " + self.table_name + " ORDER BY id LIMIT ?"
-        self.cursor.execute(sql_select, (limit,))
-        return self.cursor.fetchall()
+        with self._lock:
+            self.cursor.execute(sql_select, (limit,))
+            return self.cursor.fetchall()
 
     def delete(self, event_id):
-        self.cursor.execute("DELETE FROM " + self.table_name + " WHERE id = ?", (event_id,))
-        self.connection.commit()
+        with self._lock:
+            self.cursor.execute("DELETE FROM " + self.table_name + " WHERE id = ?", (event_id,))
+            self.connection.commit()
 
     def decode(self, text):
         return json.loads(text)
 
     def commit(self):
-        self.connection.commit()
+        with self._lock:
+            self.connection.commit()
 
     def close(self):
-        if self.cursor:
-            self.cursor.close()
-        if self.connection:
-            self.connection.commit()
-            self.connection.close()
+        with self._lock:
+            if self.cursor:
+                self.cursor.close()
+            if self.connection:
+                self.connection.commit()
+                self.connection.close()
 
 
 def acquire_lock_with_retry(lock_file, app_logger, max_attempts=3, base_delay=0.1):

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/src/notificationforwarder/syslog/forwarder.py

@@ -3,6 +3,8 @@ import socket
 import logging
 from notificationforwarder.baseclass import NotificationForwarder, NotificationFormatter, timeout
 
+logger = logging.getLogger("notificationforwarder.syslog")
+
 
 class SyslogForwarder(NotificationForwarder):
     def __init__(self, opts):

{omdnotificationforwarder-4.3 → omdnotificationforwarder-4.4}/src/notificationforwarder/telegram/forwarder.py

@@ -1,12 +1,15 @@
+import logging
 import requests
 import urllib.parse
 from notificationforwarder.baseclass import NotificationForwarder, timeout
 
+logger = logging.getLogger("notificationforwarder.telegram")
+
 class TelegramForwarder(NotificationForwarder):
     def __init__(self, opts):
         super(self.__class__, self).__init__(opts)
         setattr(self, "bot_token", getattr(self, "bot_token", None))
-        setattr(self, "chat_id", getattr(self, "hat_id", None))
+        setattr(self, "chat_id", getattr(self, "chat_id", None))
 
     @timeout(30)
     def submit(self, event):
@@ -33,7 +36,7 @@ class TelegramForwarder(NotificationForwarder):
             request_params["text"] = urllib.parse.quote(event.payload)
             request_params["parse_mode"] = "MarkdownV2"
             request_params["chat_id"] = self.chat_id
-            response = requests.get("https://api.telegram.org/bot{}/sendMessage".format(self.bot_token), params=request_parms)
+            response = requests.get("https://api.telegram.org/bot{}/sendMessage".format(self.bot_token), params=request_params)
             if response.status_code == requests.codes.ok:
                 logger.info("success: {} result is {}, request was {}".format(event.summary, response.text, request_params))
                 return True