vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 01:26:11 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Removed Pholus Dependency in DBCLNP #681

Browse Source
This commit is contained in:
jokob-sk
2024-05-25 09:54:23 +10:00
parent 10b3e91b8a
commit 23ef5759f6
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/plugins/db_cleanup/config.json
View File

@@ -39,11 +39,6 @@
"name" : "hourstokeepnewdevice", "name" : "hourstokeepnewdevice",
"type" : "setting", "type" : "setting",
"value" : "HRS_TO_KEEP_NEWDEV" "value" : "HRS_TO_KEEP_NEWDEV"
},
{
"name" : "pholuskeepdays",
"type" : "setting",
"value" : "PHOLUS_DAYS_DATA"
} }
], ],

10
front/plugins/db_cleanup/script.py
View File

@@ -36,10 +36,10 @@ def main():
values = parser.parse_args() values = parser.parse_args()
PLUGINS_KEEP_HIST = int(values.pluginskeephistory.split('=')[1]) PLUGINS_KEEP_HIST = int(values.pluginskeephistory.split('=')[1])
HRS_TO_KEEP_NEWDEV = int(values.hourstokeepnewdevice.split('=')[1]) HRS_TO_KEEP_NEWDEV = int(values.hourstokeepnewdevice.split('=')[1])
DAYS_TO_KEEP_EVENTS = int(values.daystokeepevents.split('=')[1]) DAYS_TO_KEEP_EVENTS = int(values.daystokeepevents.split('=')[1])
PHOLUS_DAYS_DATA = int(values.pholuskeepdays.split('=')[1]) PHOLUS_DAYS_DATA = get_setting_value("PHOLUS_DAYS_DATA")
mylog('verbose', [f'[{pluginName}] In script']) mylog('verbose', [f'[{pluginName}] In script'])
@@ -148,7 +148,7 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
# ----------------------------------------------------- # -----------------------------------------------------
# Cleanup Pholus_Scan # Cleanup Pholus_Scan
if PHOLUS_DAYS_DATA != 0: if PHOLUS_DAYS_DATA != "" and PHOLUS_DAYS_DATA != 0:
mylog('verbose', [f'[{pluginName}] Pholus_Scan: Delete all older than ' + str(PHOLUS_DAYS_DATA) + ' days (PHOLUS_DAYS_DATA setting)']) mylog('verbose', [f'[{pluginName}] Pholus_Scan: Delete all older than ' + str(PHOLUS_DAYS_DATA) + ' days (PHOLUS_DAYS_DATA setting)'])
# todo: improvement possibility: keep at least N per mac # todo: improvement possibility: keep at least N per mac
cursor.execute (f"""DELETE FROM Pholus_Scan cursor.execute (f"""DELETE FROM Pholus_Scan

2
front/plugins/pholus_scan/config.json
View File

@@ -205,7 +205,7 @@
"name": [ "name": [
{ {
"language_code": "en_us", "language_code": "en_us",
"string": "Schedule" "string": "Retention of data"
}, },
{ {
"language_code": "es_es", "language_code": "es_es",

2
server/plugin.py
View File

@@ -21,6 +21,8 @@ from notification import Notification_obj
class plugin_param: class plugin_param:
def __init__(self, param, plugin, db): def __init__(self, param, plugin, db):
mylog('debug', f'[Plugins] Resolving param: {param}')
paramValuesCount = 1 paramValuesCount = 1
# Get setting value # Get setting value