← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

[rs=thumper] update to loggerhead trunk, r223

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
 
32
33
 
33
34
def command_line_parser():
40
41
                      help="Serve user directories as ~user.")
41
42
    parser.add_option("--trunk-dir", metavar="DIR",
42
43
                      help="The directory that contains the trunk branches.")
 
44
    parser.add_option("--port", dest="user_port",
 
45
                      help="Port Loggerhead should listen on (defaults to 8080).")
 
46
    parser.add_option("--host", dest="user_host",
 
47
                      help="Host Loggerhead should listen on.")
 
48
    parser.add_option("--prefix", dest="user_prefix",
 
49
                      help="Specify host prefix.")
 
50
    parser.add_option("--reload", action="store_true", dest="reload",
 
51
                      help="Restarts the application when changing python"
 
52
                           " files. Only used for development purposes.")
43
53
    parser.add_option("--version", action="store_true", dest="show_version",
44
54
                      help="Print the software version and exit")
45
55
    return parser
71
81
    if options.trunk_dir and not options.user_dirs:
72
82
        print "--trunk-dir is only valid with --user-dirs"
73
83
        sys.exit(1)
 
84
        
 
85
    if options.reload:
 
86
        if Reloader.is_installed():
 
87
            Reloader.install()
 
88
        else:
 
89
            return Reloader.restart_with_reloader()
74
90
 
75
91
    if options.user_dirs:
76
92
        if not options.trunk_dir:
82
98
    app = HTTPExceptionHandler(app)
83
99
    app = TransLogger(app)
84
100
 
 
101
    if not options.user_prefix:
 
102
        prefix = '/'
 
103
    else:
 
104
        prefix = options.user_prefix
 
105
 
85
106
    try:
86
107
        from paste.deploy.config import PrefixMiddleware
87
108
    except ImportError:
88
109
        pass
89
110
    else:
90
 
        app = PrefixMiddleware(app)
91
 
 
92
 
    httpserver.serve(app, host='0.0.0.0', port='8080')
 
111
        app = PrefixMiddleware(app, prefix=prefix)
 
112
    
 
113
    if not options.user_port:
 
114
        port = '8080'
 
115
    else:
 
116
        port = options.user_port
 
117
 
 
118
    if not options.user_host:
 
119
        host = '0.0.0.0'
 
120
    else:
 
121
        host = options.user_host
 
122
 
 
123
    httpserver.serve(app, host=host, port=port)
93
124
 
94
125
 
95
126
if __name__ == "__main__":