← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Michael Hudson
  • Date: 2008-09-30 03:05:31 UTC
  • mfrom: (226.1.3 fix-breadcrumbs)
  • Revision ID: michael.hudson@canonical.com-20080930030531-at8220tnkx9pvqcw
small fixes to the breadcrumbs in the --prefix case.
(thanks Matt Nordhoff for the prods)

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 (defaults to 8080).")
 
48
    parser.add_option("--host", dest="user_host",
 
49
                      help="Host Loggerhead should listen on.")
 
50
    parser.add_option("--prefix", dest="user_prefix",
 
51
                      help="Specify host prefix.")
 
52
    parser.add_option("--reload", action="store_true", dest="reload",
 
53
                      help="Restarts the application when changing python"
 
54
                           " files. Only used for development purposes.")
 
55
    parser.add_option('--log-folder', dest="log_folder",
 
56
                      type=str, help="The directory to place log files in.")
43
57
    parser.add_option("--version", action="store_true", dest="show_version",
44
58
                      help="Print the software version and exit")
45
59
    return parser
46
60
 
47
61
 
48
62
def main(args):
49
 
    logging.basicConfig()
50
 
    logging.getLogger().setLevel(logging.DEBUG)
51
 
 
52
63
    parser = command_line_parser()
53
64
    (options, args) = parser.parse_args(sys.argv[1:])
54
65
 
72
83
        print "--trunk-dir is only valid with --user-dirs"
73
84
        sys.exit(1)
74
85
 
 
86
    if options.reload:
 
87
        if Reloader.is_installed():
 
88
            Reloader.install()
 
89
        else:
 
90
            return Reloader.restart_with_reloader()
 
91
 
75
92
    if options.user_dirs:
76
93
        if not options.trunk_dir:
77
94
            print "You didn't specify a directory for the trunk directories."
79
96
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
80
97
    else:
81
98
        app = BranchesFromFileSystemRoot(path)
 
99
 
 
100
    # setup_logging()
 
101
    logging.basicConfig()
 
102
    logging.getLogger('').setLevel(logging.DEBUG)
 
103
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
104
    if options.log_folder:
 
105
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
106
    else:
 
107
        logfile_path = 'serve-branches.log'
 
108
    logfile = logging.FileHandler(logfile_path, 'a')
 
109
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
110
                                  ' %(message)s')
 
111
    logfile.setFormatter(formatter)
 
112
    logfile.setLevel(logging.DEBUG)
 
113
    logger.addHandler(logfile)
 
114
    # setup_logging() #end
 
115
    app = ErrorHandlerApp(app)
82
116
    app = HTTPExceptionHandler(app)
83
 
    app = TransLogger(app)
 
117
    app = TransLogger(app, logger=logger)
 
118
 
 
119
    if not options.user_prefix:
 
120
        prefix = '/'
 
121
    else:
 
122
        prefix = options.user_prefix
84
123
 
85
124
    try:
86
125
        from paste.deploy.config import PrefixMiddleware
87
126
    except ImportError:
88
127
        pass
89
128
    else:
90
 
        app = PrefixMiddleware(app)
91
 
 
92
 
    httpserver.serve(app, host='0.0.0.0', port='8080')
 
129
        app = PrefixMiddleware(app, prefix=prefix)
 
130
 
 
131
    if not options.user_port:
 
132
        port = '8080'
 
133
    else:
 
134
        port = options.user_port
 
135
 
 
136
    if not options.user_host:
 
137
        host = '0.0.0.0'
 
138
    else:
 
139
        host = options.user_host
 
140
 
 
141
    httpserver.serve(app, host=host, port=port)
93
142
 
94
143
 
95
144
if __name__ == "__main__":