summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/core
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-27 14:33:39 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-27 16:19:26 -0400
commit40debc7182d9a20cc2a1ec2b6a162a065a3183c0 (patch)
tree9f782637b691ae994be632f3f5f76fe8a93d5afd /src/leap/bitmask/core
parent4d8e63e890e88c58feb750dd56ecbf60bed9b462 (diff)
[pkg] some bundling hacks
Diffstat (limited to 'src/leap/bitmask/core')
-rw-r--r--src/leap/bitmask/core/_web.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py
index 983b97e..ce30a40 100644
--- a/src/leap/bitmask/core/_web.py
+++ b/src/leap/bitmask/core/_web.py
@@ -29,7 +29,7 @@ from twisted.application import service
from twisted.web.resource import Resource
from twisted.web.server import Site, NOT_DONE_YET
from twisted.web.static import File
-from twisted.python import log
+from twisted.logger import Logger
from leap.bitmask.core.dispatcher import CommandDispatcher
@@ -39,6 +39,8 @@ try:
except ImportError:
HAS_WEB_UI = False
+log = Logger()
+
class HTTPDispatcherService(service.Service):
@@ -55,8 +57,9 @@ class HTTPDispatcherService(service.Service):
if HAS_WEB_UI:
webdir = os.path.abspath(
pkg_resources.resource_filename('leap.bitmask_js', 'public'))
+ log.debug('webdir: %s' % webdir)
else:
- log.msg('bitmask_js not found, serving bitmask.core ui')
+ log.warning('bitmask_js not found, serving bitmask.core ui')
webdir = os.path.abspath(
pkg_resources.resource_filename('leap.bitmask.core', 'web'))
root = File(webdir)