← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Pool
  • Date: 2009-01-23 20:34:40 UTC
  • mto: This revision was merged to the branch mainline in revision 298.
  • Revision ID: mbp@sourcefrog.net-20090123203440-3attwqd8tje6np09
Merge in 'serve --http' based on code from mwh

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
28
28
from loggerhead import __version__
29
29
from loggerhead.apps.filesystem import (
30
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
 
31
from loggerhead.util import Reloader
 
32
from loggerhead.apps.error import ErrorHandlerApp
31
33
 
32
34
 
33
35
def command_line_parser():
35
37
    parser.set_defaults(
36
38
        user_dirs=False,
37
39
        show_version=False,
 
40
        log_folder=None,
38
41
        )
39
42
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
40
43
                      help="Serve user directories as ~user.")
41
44
    parser.add_option("--trunk-dir", metavar="DIR",
42
45
                      help="The directory that contains the trunk branches.")
 
46
    parser.add_option("--port", dest="user_port",
 
47
                      help=("Port Loggerhead should listen on "
 
48
                            "(defaults to 8080)."))
 
49
    parser.add_option("--host", dest="user_host",
 
50
                      help="Host Loggerhead should listen on.")
 
51
    parser.add_option("--prefix", dest="user_prefix",
 
52
                      help="Specify host prefix.")
 
53
    parser.add_option("--profile", action="store_true", dest="profile",
 
54
                      help="Generate callgrind profile data to "
 
55
                        "%d-stats.callgrind on each request.")
 
56
    parser.add_option("--reload", action="store_true", dest="reload",
 
57
                      help="Restarts the application when changing python"
 
58
                           " files. Only used for development purposes.")
 
59
    parser.add_option('--log-folder', dest="log_folder",
 
60
                      type=str, help="The directory to place log files in.")
43
61
    parser.add_option("--version", action="store_true", dest="show_version",
44
62
                      help="Print the software version and exit")
45
63
    return parser
46
64
 
47
65
 
48
66
def main(args):
49
 
    logging.basicConfig()
50
 
    logging.getLogger().setLevel(logging.DEBUG)
51
 
 
52
67
    parser = command_line_parser()
53
68
    (options, args) = parser.parse_args(sys.argv[1:])
54
69
 
72
87
        print "--trunk-dir is only valid with --user-dirs"
73
88
        sys.exit(1)
74
89
 
 
90
    if options.reload:
 
91
        if Reloader.is_installed():
 
92
            Reloader.install()
 
93
        else:
 
94
            return Reloader.restart_with_reloader()
 
95
 
75
96
    if options.user_dirs:
76
97
        if not options.trunk_dir:
77
98
            print "You didn't specify a directory for the trunk directories."
79
100
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
80
101
    else:
81
102
        app = BranchesFromFileSystemRoot(path)
 
103
 
 
104
    # setup_logging()
 
105
    logging.basicConfig()
 
106
    logging.getLogger('').setLevel(logging.DEBUG)
 
107
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
108
    if options.log_folder:
 
109
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
110
    else:
 
111
        logfile_path = 'serve-branches.log'
 
112
    logfile = logging.FileHandler(logfile_path, 'a')
 
113
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
114
                                  ' %(message)s')
 
115
    logfile.setFormatter(formatter)
 
116
    logfile.setLevel(logging.DEBUG)
 
117
    logger.addHandler(logfile)
 
118
    # setup_logging() #end
 
119
    app = ErrorHandlerApp(app)
82
120
    app = HTTPExceptionHandler(app)
83
 
    app = TransLogger(app)
 
121
    app = TransLogger(app, logger=logger)
 
122
    if options.profile:
 
123
        from loggerhead.middleware.profile import LSProfMiddleware
 
124
        app = LSProfMiddleware(app)
 
125
 
 
126
    if not options.user_prefix:
 
127
        prefix = '/'
 
128
    else:
 
129
        prefix = options.user_prefix
84
130
 
85
131
    try:
86
132
        from paste.deploy.config import PrefixMiddleware
87
133
    except ImportError:
88
134
        pass
89
135
    else:
90
 
        app = PrefixMiddleware(app)
91
 
 
92
 
    httpserver.serve(app, host='0.0.0.0', port='8080')
 
136
        app = PrefixMiddleware(app, prefix=prefix)
 
137
 
 
138
    if not options.user_port:
 
139
        port = '8080'
 
140
    else:
 
141
        port = options.user_port
 
142
 
 
143
    if not options.user_host:
 
144
        host = '0.0.0.0'
 
145
    else:
 
146
        host = options.user_host
 
147
 
 
148
    httpserver.serve(app, host=host, port=port)
93
149
 
94
150
 
95
151
if __name__ == "__main__":