diff options
| author | Roald de Vries <rdevries@thoughtworks.com> | 2016-09-22 17:29:58 +0200 |
|---|---|---|
| committer | Roald de Vries <rdevries@thoughtworks.com> | 2016-09-22 17:29:58 +0200 |
| commit | 3db89b8929e5cc782382b4b89001a968f959cfd1 (patch) | |
| tree | f297de1349507e9e2833caa302aa17d8b1ab21a9 /service | |
| parent | a42e2fb603f9f1b82bb18e1636a64eb3bf518884 (diff) | |
move loglinegenerator to the support package
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/application.py | 5 | ||||
| -rw-r--r-- | service/pixelated/support/loglinegenerator.py (renamed from service/loglinegenerator.py) | 0 | ||||
| -rw-r--r-- | service/twisted/plugins/logger.py | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 30e1bd3a..90a179f0 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -41,7 +41,7 @@ from pixelated.config.site import PixelatedSite from pixelated.resources.auth import LeapPasswordChecker, PixelatedRealm, PixelatedAuthSessionWrapper, SessionChecker from pixelated.resources.login_resource import LoginResource from pixelated.resources.root_resource import RootResource -from loglinegenerator import ILogLineGenerator +from pixelated.support.loglinegenerator import ILogLineGenerator log = logging.getLogger(__name__) @@ -213,9 +213,6 @@ def start_site(config, resource): if config.manhole: log.info('Starting the manhole on port 8008') - passwdFile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'passwd') - namespace = globals() - multiService = manhole_tap.makeService(dict(namespace=globals(), telnetPort='8008', sshPort='8009', diff --git a/service/loglinegenerator.py b/service/pixelated/support/loglinegenerator.py index 3b7820fb..3b7820fb 100644 --- a/service/loglinegenerator.py +++ b/service/pixelated/support/loglinegenerator.py diff --git a/service/twisted/plugins/logger.py b/service/twisted/plugins/logger.py index b466d015..6503bb13 100644 --- a/service/twisted/plugins/logger.py +++ b/service/twisted/plugins/logger.py @@ -3,7 +3,7 @@ import sys from zope.interface import implementer from twisted.plugin import IPlugin -from loglinegenerator import ILogLineGenerator +from pixelated.support.loglinegenerator import ILogLineGenerator @implementer(IPlugin, ILogLineGenerator) |