diff --git a/evennia/server/amp.py b/evennia/server/amp.py index 2fee354fd3..88954d285b 100644 --- a/evennia/server/amp.py +++ b/evennia/server/amp.py @@ -86,6 +86,7 @@ class AmpServerFactory(protocol.ServerFactory): connections from the Portal. """ noisy = False + def __init__(self, server): """ Initialize the factory. diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index 1e7d9d33b8..b39081878e 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -230,6 +230,7 @@ if TELNET_ENABLED: for port in TELNET_PORTS: pstring = "%s:%s" % (ifacestr, port) factory = protocol.ServerFactory() + factory.noisy = False factory.protocol = telnet.TelnetProtocol factory.sessionhandler = PORTAL_SESSIONS telnet_service = internet.TCPServer(port, factory, interface=interface) @@ -252,6 +253,7 @@ if SSL_ENABLED: for port in SSL_PORTS: pstring = "%s:%s" % (ifacestr, port) factory = protocol.ServerFactory() + factory.noisy = False factory.sessionhandler = PORTAL_SESSIONS factory.protocol = ssl.SSLProtocol ssl_service = internet.SSLServer(port, @@ -280,6 +282,7 @@ if SSH_ENABLED: factory = ssh.makeFactory({'protocolFactory': ssh.SshProtocol, 'protocolArgs': (), 'sessions': PORTAL_SESSIONS}) + factory.noisy = False ssh_service = internet.TCPServer(port, factory, interface=interface) ssh_service.setName('EvenniaSSH%s' % pstring) PORTAL.services.addService(ssh_service) @@ -322,6 +325,7 @@ if WEBSERVER_ENABLED: ifacestr = "-%s" % interface pstring = "%s:%s" % (ifacestr, port) factory = protocol.ServerFactory() + factory.noisy = False factory.protocol = webclient.WebSocketClient factory.sessionhandler = PORTAL_SESSIONS websocket_service = internet.TCPServer(port, WebSocketFactory(factory), interface=interface) @@ -346,6 +350,7 @@ for plugin_module in PORTAL_SERVICES_PLUGIN_MODULES: print('-' * 50) # end of terminal output if os.name == 'nt': + factory.noisy = False # Windows only: Set PID file manually with open(PORTAL_PIDFILE, 'w') as f: f.write(str(os.getpid())) diff --git a/evennia/server/webserver.py b/evennia/server/webserver.py index 249b492a4f..23f0603d9b 100644 --- a/evennia/server/webserver.py +++ b/evennia/server/webserver.py @@ -144,6 +144,7 @@ class Website(server.Site): """ This class will only log http requests if settings.DEBUG is True. """ + noisy = False def log(self, request): "Conditional logging" if _DEBUG: diff --git a/evennia/utils/txws.py b/evennia/utils/txws.py index 950af8794d..52a718ab6b 100644 --- a/evennia/utils/txws.py +++ b/evennia/utils/txws.py @@ -641,5 +641,5 @@ class WebSocketFactory(WrappingFactory): Factory which wraps another factory to provide WebSockets transports for all of its protocols. """ - + noisy = False protocol = WebSocketProtocol