Added some more noisy=False to other factories as per #1107.

This commit is contained in:
Griatch 2016-10-22 16:02:32 +02:00
parent 5b07a8bd2c
commit f423771423
4 changed files with 8 additions and 1 deletions

View file

@ -86,6 +86,7 @@ class AmpServerFactory(protocol.ServerFactory):
connections from the Portal. connections from the Portal.
""" """
noisy = False noisy = False
def __init__(self, server): def __init__(self, server):
""" """
Initialize the factory. Initialize the factory.

View file

@ -230,6 +230,7 @@ if TELNET_ENABLED:
for port in TELNET_PORTS: for port in TELNET_PORTS:
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
factory = protocol.ServerFactory() factory = protocol.ServerFactory()
factory.noisy = False
factory.protocol = telnet.TelnetProtocol factory.protocol = telnet.TelnetProtocol
factory.sessionhandler = PORTAL_SESSIONS factory.sessionhandler = PORTAL_SESSIONS
telnet_service = internet.TCPServer(port, factory, interface=interface) telnet_service = internet.TCPServer(port, factory, interface=interface)
@ -252,6 +253,7 @@ if SSL_ENABLED:
for port in SSL_PORTS: for port in SSL_PORTS:
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
factory = protocol.ServerFactory() factory = protocol.ServerFactory()
factory.noisy = False
factory.sessionhandler = PORTAL_SESSIONS factory.sessionhandler = PORTAL_SESSIONS
factory.protocol = ssl.SSLProtocol factory.protocol = ssl.SSLProtocol
ssl_service = internet.SSLServer(port, ssl_service = internet.SSLServer(port,
@ -280,6 +282,7 @@ if SSH_ENABLED:
factory = ssh.makeFactory({'protocolFactory': ssh.SshProtocol, factory = ssh.makeFactory({'protocolFactory': ssh.SshProtocol,
'protocolArgs': (), 'protocolArgs': (),
'sessions': PORTAL_SESSIONS}) 'sessions': PORTAL_SESSIONS})
factory.noisy = False
ssh_service = internet.TCPServer(port, factory, interface=interface) ssh_service = internet.TCPServer(port, factory, interface=interface)
ssh_service.setName('EvenniaSSH%s' % pstring) ssh_service.setName('EvenniaSSH%s' % pstring)
PORTAL.services.addService(ssh_service) PORTAL.services.addService(ssh_service)
@ -322,6 +325,7 @@ if WEBSERVER_ENABLED:
ifacestr = "-%s" % interface ifacestr = "-%s" % interface
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
factory = protocol.ServerFactory() factory = protocol.ServerFactory()
factory.noisy = False
factory.protocol = webclient.WebSocketClient factory.protocol = webclient.WebSocketClient
factory.sessionhandler = PORTAL_SESSIONS factory.sessionhandler = PORTAL_SESSIONS
websocket_service = internet.TCPServer(port, WebSocketFactory(factory), interface=interface) 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 print('-' * 50) # end of terminal output
if os.name == 'nt': if os.name == 'nt':
factory.noisy = False
# Windows only: Set PID file manually # Windows only: Set PID file manually
with open(PORTAL_PIDFILE, 'w') as f: with open(PORTAL_PIDFILE, 'w') as f:
f.write(str(os.getpid())) f.write(str(os.getpid()))

View file

@ -144,6 +144,7 @@ class Website(server.Site):
""" """
This class will only log http requests if settings.DEBUG is True. This class will only log http requests if settings.DEBUG is True.
""" """
noisy = False
def log(self, request): def log(self, request):
"Conditional logging" "Conditional logging"
if _DEBUG: if _DEBUG:

View file

@ -641,5 +641,5 @@ class WebSocketFactory(WrappingFactory):
Factory which wraps another factory to provide WebSockets transports for Factory which wraps another factory to provide WebSockets transports for
all of its protocols. all of its protocols.
""" """
noisy = False
protocol = WebSocketProtocol protocol = WebSocketProtocol