vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-15 22:51:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

clearPluginObjects

Browse Source 
added sub to be called during main loop to clear plugins_objects table
This commit is contained in:
Ingo Ratsdorf
2025-09-15 15:54:51 +12:00
parent aee93c0e24
commit 750fb33e1c
2 changed files with 111 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/__main__.py
+1
View File
@@ -189,6 +189,7 @@ def main ():
notification.clearPendingEmailFlag()
else:
notification.clearPluginObjects()
mylog('verbose', ['[Notification] No changes to report'])
# Commit SQL
server/models/notification_instance.py
+38 -31
View File
@@ -1,12 +1,8 @@
import datetime
import os
import _io
import json
import sys
import uuid
import socket
import subprocess
import requests
from yattag import indent
from json2table import convert
@@ -16,15 +12,20 @@ sys.path.extend([f"{INSTALL_PATH}/server"])
# Register NetAlertX modules
import conf
from const import applicationPath, logPath, apiPath, confFileName, reportTemplatesPath
from logger import logResult, mylog
from helper import generate_mac_links, removeDuplicateNewLines, timeNowTZ, get_file_content, write_file, get_setting_value, get_timezone_offset
from const import applicationPath, logPath, apiPath, reportTemplatesPath
from logger import mylog
from helper import generate_mac_links, \
removeDuplicateNewLines, \
timeNowTZ, \
write_file, \
get_setting_value, \
get_timezone_offset
from messaging.in_app import write_notification
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# Notification object handling
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
class NotificationInstance:
def __init__(self, db):
self.db = db
@@ -52,7 +53,6 @@ class NotificationInstance:
return JSON, Extra
# Create a new DB entry if new notifications available, otherwise skip
def create(self, JSON, Extra=""):
@@ -78,8 +78,6 @@ class NotificationInstance:
self.Extra = Extra
if self.HasNotifications:
# if not notiStruc.json['data'] and not notiStruc.text and not notiStruc.html:
# mylog('debug', '[Notification] notiStruc is empty')
# else:
@@ -89,7 +87,6 @@ class NotificationInstance:
HTML = ""
template_file_path = reportTemplatesPath + 'report_template.html'
# Open text Template
mylog('verbose', ['[Notification] Open text Template'])
template_file = open(reportTemplatesPath + 'report_template.txt', 'r')
@@ -256,9 +253,7 @@ class NotificationInstance:
self.save()
# Clear the Pending Email flag from all events and devices
def clearPendingEmailFlag(self):
# Clean Pending Alert Events
@@ -280,7 +275,6 @@ class NotificationInstance:
AND eve_DateTime < datetime('now', '-{get_setting_value('NTFPRCS_alert_down_time')} minutes', '{get_timezone_offset()}')
""")
# clear plugin events
self.db.sql.execute("DELETE FROM Plugins_Events")
@@ -289,17 +283,21 @@ class NotificationInstance:
self.save()
def clearPluginObjects(self):
# clear plugin events
self.db.sql.execute("DELETE FROM Plugins_Events")
self.save()
def save(self):
# Commit changes
self.db.commitDB()
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# Reporting
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
def construct_notifications(JSON, section):
jsn = JSON[section]
@@ -314,14 +312,20 @@ def construct_notifications(JSON, section):
html = ''
text = ''
table_attributes = {"style" : "border-collapse: collapse; font-size: 12px; color:#70707", "width" : "100%", "cellspacing" : 0, "cellpadding" : "3px", "bordercolor" : "#C0C0C0", "border":"1"}
table_attributes = {
"style": "border-collapse: collapse; font-size: 12px; color:#70707",
"width": "100%",
"cellspacing": 0,
"cellpadding": "3px",
"bordercolor": "#C0C0C0",
"border": "1"
}
headerProps = "width='120px' style='color:white; font-size: 16px;' bgcolor='#64a0d6' "
thProps = "width='120px' style='color:#F0F0F0' bgcolor='#64a0d6' "
build_direction = "TOP_TO_BOTTOM"
text_line = '{}\t{}\n'
if len(jsn) > 0:
text = tableTitle + "\n---------\n"
@@ -329,7 +333,13 @@ def construct_notifications(JSON, section):
html = convert({"data": jsn}, build_direction=build_direction, table_attributes=table_attributes)
# Cleanup the generated HTML table notification
html = format_table(html, "data", headerProps, tableTitle).replace('<ul>','<ul style="list-style:none;padding-left:0">').replace("<td>null</td>", "<td></td>")
html = format_table(html,
"data",
headerProps,
tableTitle).replace('<ul>',
'<ul style="list-style:none;padding-left:0">'
).replace("<td>null</td>",
"<td></td>")
# prepare text-only message
for device in jsn:
@@ -346,7 +356,8 @@ def construct_notifications(JSON, section):
return html, text
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
def send_api(json_final, mail_text, mail_html):
mylog('verbose', ['[Send API] Updating notification_* files in ', apiPath])
@@ -355,8 +366,7 @@ def send_api(json_final, mail_text, mail_html):
write_file(apiPath + 'notification_json_final.json', json.dumps(json_final))
#-------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# Replacing table headers
def format_table(html, thValue, props, newThValue=''):
@@ -364,6 +374,3 @@ def format_table (html, thValue, props, newThValue = ''):
newThValue = thValue
return html.replace("<th>"+thValue+"</th>", "<th "+props+" >"+newThValue+"</th>")