playing with txaio logging API
This commit is contained in:
parent
de60f0415c
commit
6e834c5dbd
|
@ -39,14 +39,14 @@ h = PrintHandler()
|
|||
logging.getLogger("trollius").addHandler(h)
|
||||
|
||||
|
||||
def make_logger(logger_type=None):
|
||||
if logger_type == "twisted":
|
||||
# If we've been asked for the Twisted logger, try and get the new one
|
||||
try:
|
||||
from twisted.logger import Logger
|
||||
return Logger()
|
||||
except ImportError:
|
||||
pass
|
||||
# def make_logger(logger_type=None):
|
||||
# if logger_type == "twisted":
|
||||
# # If we've been asked for the Twisted logger, try and get the new one
|
||||
# try:
|
||||
# from twisted.logger import Logger
|
||||
# return Logger()
|
||||
# except ImportError:
|
||||
# pass
|
||||
|
||||
from logging import getLogger
|
||||
return getLogger()
|
||||
# from logging import getLogger
|
||||
# return getLogger()
|
||||
|
|
|
@ -42,8 +42,8 @@ except ImportError:
|
|||
from trollius import iscoroutine
|
||||
from trollius import Future
|
||||
|
||||
from autobahn._logging import make_logger
|
||||
from autobahn.websocket.types import ConnectionDeny
|
||||
from txaio import make_logger
|
||||
|
||||
|
||||
__all__ = (
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
|
||||
from __future__ import absolute_import
|
||||
|
||||
import sys
|
||||
import inspect
|
||||
|
||||
import six
|
||||
|
@ -169,9 +168,7 @@ class ApplicationRunner(object):
|
|||
|
||||
isSecure, host, port, resource, path, params = parseWsUrl(self.url)
|
||||
|
||||
# start logging to console
|
||||
if self.debug or self.debug_wamp or self.debug_app:
|
||||
log.startLogging(sys.stdout)
|
||||
txaio.start_logging()
|
||||
|
||||
# factory for use ApplicationSession
|
||||
def create():
|
||||
|
|
|
@ -42,7 +42,7 @@ from autobahn.websocket.types import ConnectionRequest, ConnectionResponse, \
|
|||
from autobahn.websocket import protocol
|
||||
from autobahn.twisted.util import peer2str
|
||||
|
||||
from autobahn._logging import make_logger
|
||||
from txaio import make_logger
|
||||
|
||||
from autobahn.websocket.compress import PerMessageDeflateOffer, \
|
||||
PerMessageDeflateOfferAccept, \
|
||||
|
@ -223,7 +223,7 @@ class WebSocketAdapterFactory(object):
|
|||
"""
|
||||
Adapter class for Twisted-based WebSocket client and server factories.
|
||||
"""
|
||||
log = make_logger("twisted")
|
||||
log = make_logger()
|
||||
|
||||
|
||||
class WebSocketServerFactory(WebSocketAdapterFactory, protocol.WebSocketServerFactory, twisted.internet.protocol.ServerFactory):
|
||||
|
|
2
setup.py
2
setup.py
|
@ -182,7 +182,7 @@ setup(
|
|||
platforms='Any',
|
||||
install_requires=[
|
||||
'six>=1.9.0', # MIT license
|
||||
'txaio>=1.1.0' # MIT license
|
||||
'txaio>=2.0.0', # MIT license
|
||||
],
|
||||
extras_require={
|
||||
'all': extras_require_all,
|
||||
|
|
Loading…
Reference in New Issue