← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 12:29:36 UTC
  • Revision ID: john@arbash-meinel.com-20110316122936-u1u98hqpwyv08ry9
Import sys at the start of loggerhead/__init__.py we use it as part of startup.
And sys is always loaded, no need to avoid importing it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
30
30
starts a web server to browse the contents of a branch.
31
31
"""
32
32
 
 
33
import sys
 
34
 
33
35
from info import (
34
36
    bzr_plugin_version as version_info,
35
37
    bzr_compatible_versions,
49
51
    HELP = ('Loggerhead, a web-based code viewer and server. (default port: %d)' %
50
52
            (DEFAULT_PORT,))
51
53
 
52
 
    def setup_logging(config):
53
 
        import logging
54
 
        import sys
55
 
 
56
 
        logger = logging.getLogger('loggerhead')
57
 
        handler = logging.StreamHandler(sys.stderr)
58
 
        handler.setLevel(logging.DEBUG)
59
 
        logger.addHandler(handler)
60
 
        logging.getLogger('simpleTAL').addHandler(handler)
61
 
        logging.getLogger('simpleTALES').addHandler(handler)
62
 
 
63
54
    def _ensure_loggerhead_path():
64
55
        """Ensure that you can 'import loggerhead' and get the root."""
65
56
        # loggerhead internal code will try to 'import loggerhead', so
78
69
 
79
70
        from loggerhead.apps.transport import BranchesFromTransportRoot
80
71
        from loggerhead.config import LoggerheadConfig
 
72
        from loggerhead.main import setup_logging
81
73
 
82
74
        if host is None:
83
75
            host = DEFAULT_HOST
87
79
        if not transport.is_readonly():
88
80
            argv.insert(0, '--allow-writes')
89
81
        config = LoggerheadConfig(argv)
90
 
        setup_logging(config)
 
82
        setup_logging(config, init_logging=False, log_file=sys.stderr)
91
83
        app = BranchesFromTransportRoot(transport.base, config)
92
84
        app = HTTPExceptionHandler(app)
93
85
        serve(app, host=host, port=port)