From 8335c5dc4c1767117d6d89a08a0b3cc99b2f9160 Mon Sep 17 00:00:00 2001 From: anti Date: Tue, 14 Apr 2026 00:16:18 -0400 Subject: [PATCH] fix: remove duplicate print() in _log() across all service templates Every service's _log() called print() then write_syslog_file() which also calls print(), causing every log line to appear twice in Docker logs. The collector streamed both copies, doubling ingested events. Removed the redundant print() from all 22 service server.py files. --- templates/docker_api/server.py | 1 - templates/elasticsearch/server.py | 1 - templates/ftp/server.py | 1 - templates/http/server.py | 1 - templates/imap/server.py | 1 - templates/k8s/server.py | 1 - templates/ldap/server.py | 1 - templates/llmnr/server.py | 1 - templates/mongodb/server.py | 1 - templates/mqtt/server.py | 1 - templates/mssql/server.py | 1 - templates/mysql/server.py | 1 - templates/pop3/server.py | 1 - templates/postgres/server.py | 1 - templates/rdp/server.py | 1 - templates/redis/server.py | 1 - templates/sip/server.py | 1 - templates/smb/server.py | 1 - templates/smtp/server.py | 1 - templates/snmp/server.py | 1 - templates/tftp/server.py | 1 - templates/vnc/server.py | 1 - 22 files changed, 22 deletions(-) diff --git a/templates/docker_api/server.py b/templates/docker_api/server.py index 594a185..5210d0e 100644 --- a/templates/docker_api/server.py +++ b/templates/docker_api/server.py @@ -62,7 +62,6 @@ _CONTAINERS = [ def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/elasticsearch/server.py b/templates/elasticsearch/server.py index 4b0ea84..287c0bb 100644 --- a/templates/elasticsearch/server.py +++ b/templates/elasticsearch/server.py @@ -40,7 +40,6 @@ _ROOT_RESPONSE = { def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/ftp/server.py b/templates/ftp/server.py index 94820a6..95f756d 100644 --- a/templates/ftp/server.py +++ b/templates/ftp/server.py @@ -22,7 +22,6 @@ BANNER = os.environ.get("FTP_BANNER", "220 (vsFTPd 3.0.3)") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/http/server.py b/templates/http/server.py index c666eeb..076c5ac 100644 --- a/templates/http/server.py +++ b/templates/http/server.py @@ -68,7 +68,6 @@ def _fix_server_header(response): def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/imap/server.py b/templates/imap/server.py index 71489af..6d5498a 100644 --- a/templates/imap/server.py +++ b/templates/imap/server.py @@ -236,7 +236,6 @@ _MAILBOXES = ["INBOX", "Sent", "Drafts", "Archive"] def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/k8s/server.py b/templates/k8s/server.py index bf96fb9..283307a 100644 --- a/templates/k8s/server.py +++ b/templates/k8s/server.py @@ -69,7 +69,6 @@ _SECRETS = { def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/ldap/server.py b/templates/ldap/server.py index bfef78f..7c3135c 100644 --- a/templates/ldap/server.py +++ b/templates/ldap/server.py @@ -18,7 +18,6 @@ LOG_TARGET = os.environ.get("LOG_TARGET", "") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/llmnr/server.py b/templates/llmnr/server.py index 7d0fc95..e9efcee 100644 --- a/templates/llmnr/server.py +++ b/templates/llmnr/server.py @@ -20,7 +20,6 @@ LOG_TARGET = os.environ.get("LOG_TARGET", "") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/mongodb/server.py b/templates/mongodb/server.py index cc16af5..1979b48 100644 --- a/templates/mongodb/server.py +++ b/templates/mongodb/server.py @@ -62,7 +62,6 @@ def _op_msg(request_id: int, doc: bytes) -> bytes: def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/mqtt/server.py b/templates/mqtt/server.py index d0b43c1..a25860d 100644 --- a/templates/mqtt/server.py +++ b/templates/mqtt/server.py @@ -28,7 +28,6 @@ _CONNACK_NOT_AUTH = b"\x20\x02\x00\x05" def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/mssql/server.py b/templates/mssql/server.py index 41040d8..114c01b 100644 --- a/templates/mssql/server.py +++ b/templates/mssql/server.py @@ -45,7 +45,6 @@ _PRELOGIN_RESP = bytes([ def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/mysql/server.py b/templates/mysql/server.py index 812a910..02a7f7f 100644 --- a/templates/mysql/server.py +++ b/templates/mysql/server.py @@ -44,7 +44,6 @@ def _make_packet(payload: bytes, seq: int = 0) -> bytes: def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/pop3/server.py b/templates/pop3/server.py index 33bca78..6978fdd 100644 --- a/templates/pop3/server.py +++ b/templates/pop3/server.py @@ -161,7 +161,6 @@ _BAIT_EMAILS: list[str] = [ def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/postgres/server.py b/templates/postgres/server.py index 45126d7..22cc821 100644 --- a/templates/postgres/server.py +++ b/templates/postgres/server.py @@ -24,7 +24,6 @@ def _error_response(message: str) -> bytes: def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/rdp/server.py b/templates/rdp/server.py index 12a0a48..274045f 100644 --- a/templates/rdp/server.py +++ b/templates/rdp/server.py @@ -21,7 +21,6 @@ LOG_TARGET = os.environ.get("LOG_TARGET", "") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/redis/server.py b/templates/redis/server.py index 4aa5961..fae4dee 100644 --- a/templates/redis/server.py +++ b/templates/redis/server.py @@ -46,7 +46,6 @@ _FAKE_STORE = { def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/sip/server.py b/templates/sip/server.py index a84c0c7..cbacaca 100644 --- a/templates/sip/server.py +++ b/templates/sip/server.py @@ -30,7 +30,6 @@ _401 = ( def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/smb/server.py b/templates/smb/server.py index aa5d1a9..6df2588 100644 --- a/templates/smb/server.py +++ b/templates/smb/server.py @@ -18,7 +18,6 @@ LOG_TARGET = os.environ.get("LOG_TARGET", "") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/smtp/server.py b/templates/smtp/server.py index 3f524fe..7b22181 100644 --- a/templates/smtp/server.py +++ b/templates/smtp/server.py @@ -37,7 +37,6 @@ _SMTP_MTA = os.environ.get("SMTP_MTA", NODE_NAME) def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/snmp/server.py b/templates/snmp/server.py index 34bb7bd..fdb8a06 100644 --- a/templates/snmp/server.py +++ b/templates/snmp/server.py @@ -68,7 +68,6 @@ _OID_VALUES = { def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/tftp/server.py b/templates/tftp/server.py index 602cdc9..775bde8 100644 --- a/templates/tftp/server.py +++ b/templates/tftp/server.py @@ -28,7 +28,6 @@ def _error_pkt(code: int, msg: str) -> bytes: def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET) diff --git a/templates/vnc/server.py b/templates/vnc/server.py index 7f8637f..6f549b9 100644 --- a/templates/vnc/server.py +++ b/templates/vnc/server.py @@ -20,7 +20,6 @@ LOG_TARGET = os.environ.get("LOG_TARGET", "") def _log(event_type: str, severity: int = 6, **kwargs) -> None: line = syslog_line(SERVICE_NAME, NODE_NAME, event_type, severity, **kwargs) - print(line, flush=True) write_syslog_file(line) forward_syslog(line, LOG_TARGET)