← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Albisetti
  • Date: 2008-10-10 19:26:48 UTC
  • mfrom: (218.2.7 loggerhead.empty_branch)
  • Revision ID: martin.albisetti@canonical.com-20081010192648-3ubztpqkk3ky303q
Fix bug #258710, /files page explodes in an empty branch. (Marius Kruger)

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
31
32
from loggerhead.apps.error import ErrorHandlerApp
32
33
 
 
34
 
33
35
def command_line_parser():
34
36
    parser = OptionParser("%prog [options] <path>")
35
37
    parser.set_defaults(
41
43
                      help="Serve user directories as ~user.")
42
44
    parser.add_option("--trunk-dir", metavar="DIR",
43
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.")
44
57
    parser.add_option("--version", action="store_true", dest="show_version",
45
58
                      help="Print the software version and exit")
46
 
    parser.add_option('--log-folder', dest="log_folder", 
47
 
                      type=str, help="The directory to place log files")
48
59
    return parser
49
60
 
50
61
 
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)
82
 
    
 
99
 
83
100
    # setup_logging()
84
101
    logging.basicConfig()
85
102
    logging.getLogger('').setLevel(logging.DEBUG)
99
116
    app = HTTPExceptionHandler(app)
100
117
    app = TransLogger(app, logger=logger)
101
118
 
 
119
    if not options.user_prefix:
 
120
        prefix = '/'
 
121
    else:
 
122
        prefix = options.user_prefix
102
123
 
103
124
    try:
104
125
        from paste.deploy.config import PrefixMiddleware
105
126
    except ImportError:
106
127
        pass
107
128
    else:
108
 
        app = PrefixMiddleware(app)
109
 
 
110
 
    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)
111
142
 
112
143
 
113
144
if __name__ == "__main__":