fix/merge-testing-to-main #4

Merged
anti merged 138 commits from fix/merge-testing-to-main into main 2026-04-12 10:10:19 +02:00
3 changed files with 5 additions and 2 deletions
Showing only changes of commit b325fc8c5f - Show all commits

View File

@@ -71,7 +71,7 @@ class ServerFTPFactory(FTPFactory):
welcomeMessage = BANNER
if __name__ == "__main__":
twisted_log.startLogging(sys.stdout)
twisted_log.startLoggingWithObserver(lambda e: None, setStdout=False)
_log("startup", msg=f"FTP server starting as {NODE_NAME} on port {PORT}")
reactor.listenTCP(PORT, ServerFTPFactory())
reactor.run()

View File

@@ -6,6 +6,7 @@ and responds with configurable pages. Forwards events as JSON to LOG_TARGET if s
"""
import json
import logging
import os
from pathlib import Path
@@ -13,6 +14,8 @@ from flask import Flask, request, send_from_directory
from werkzeug.serving import make_server, WSGIRequestHandler
from decnet_logging import syslog_line, write_syslog_file, forward_syslog
logging.getLogger("werkzeug").setLevel(logging.ERROR)
NODE_NAME = os.environ.get("NODE_NAME", "webserver")
SERVICE_NAME = "http"
LOG_TARGET = os.environ.get("LOG_TARGET", "")

View File

@@ -51,7 +51,7 @@ class RDPServerFactory(protocol.ServerFactory):
if __name__ == "__main__":
twisted_log.startLogging(sys.stdout)
twisted_log.startLoggingWithObserver(lambda e: None, setStdout=False)
_log("startup", msg=f"RDP server starting as {NODE_NAME} on port 3389")
reactor.listenTCP(3389, RDPServerFactory())
reactor.run()