summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/core/bitmaskd.tac
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2016-10-13 12:08:46 -0300
committerKali Kaneko (leap communications) <kali@leap.se>2016-10-17 19:38:21 -0400
commitc8eba064959310e44bdc2a4f0df49a534e761d04 (patch)
tree8d5e30031d291c1db78a746b1941e25514c1e01d /src/leap/bitmask/core/bitmaskd.tac
parentc1fdf7dfa3ba6f7eeca2a1f980ab4a68da735654 (diff)
[bug] use twisted.logger and fix logging namespace
Diffstat (limited to 'src/leap/bitmask/core/bitmaskd.tac')
-rw-r--r--src/leap/bitmask/core/bitmaskd.tac15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/leap/bitmask/core/bitmaskd.tac b/src/leap/bitmask/core/bitmaskd.tac
index eba25307..ac7e1383 100644
--- a/src/leap/bitmask/core/bitmaskd.tac
+++ b/src/leap/bitmask/core/bitmaskd.tac
@@ -2,14 +2,19 @@
# Run as: twistd -n -y bitmaskd.tac
#
from twisted.application import service
-from twisted.python.log import ILogObserver, FileLogObserver
+from twisted.logger import ILogObserver
+from twisted.logger import FileLogObserver
+from twisted.logger import formatEventAsClassicLogText as formatEvent
from leap.bitmask.core.service import BitmaskBackend
-from leap.bitmask.core.logs import loggerFactory
-
-logger = loggerFactory()
+from leap.bitmask.core.logs import logFileFactory
bb = BitmaskBackend()
application = service.Application("bitmaskd")
-application.setComponent(ILogObserver, FileLogObserver(logger).emit)
+
+# configure logging
+log_file = logFileFactory()
+observer = FileLogObserver(log_file, formatEvent)
+application.setComponent(ILogObserver, observer)
+
bb.setServiceParent(application)