From 77036e161c3c01dfced1a12124eb0722da1d3dd6 Mon Sep 17 00:00:00 2001 From: Stephan de Wit Date: Fri, 18 Oct 2024 15:49:51 +0200 Subject: [PATCH] firewall: cleanup previous --- src/opnsense/scripts/filter/read_log.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/opnsense/scripts/filter/read_log.py b/src/opnsense/scripts/filter/read_log.py index 348c6b199..9adf4de0e 100755 --- a/src/opnsense/scripts/filter/read_log.py +++ b/src/opnsense/scripts/filter/read_log.py @@ -181,9 +181,9 @@ if __name__ == '__main__': line_threshold = 10 line_count = 0 throttle_interval = 100 # ms + counter = {} + start_t_ms = time.time() * 1000 try: - counter = {} - start_t_ms = (time.time() * 1000) while True: ready, _, _ = select.select([f.stdout], [], [], 1) if not ready: @@ -199,8 +199,7 @@ if __name__ == '__main__': running_conf_descr = fetch_rule_details() rule = parse_record({'line': line}, running_conf_descr) if rule != None: - if rule['rid'] != '0': - counter[rule['rid']] = counter.get(rule['rid'], 0) + 1 + counter[rule['rid']] = counter.get(rule['rid'], 0) + 1 rule['counter'] = counter[rule['rid']] line_count += 1 @@ -209,7 +208,7 @@ if __name__ == '__main__': print(f"event: message\ndata: {ujson.dumps(rule)}\n\n", flush=True) elif elapsed >= throttle_interval: line_count = 0 - start_t_ms = (time.time() * 1000) + start_t_ms = time.time() * 1000 else: break except KeyboardInterrupt: