← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Jelmer Vernooij
  • Date: 2008-08-06 18:39:15 UTC
  • mto: (197.1.9 pathargs)
  • mto: This revision was merged to the branch mainline in revision 202.
  • Revision ID: jelmer@samba.org-20080806183915-81q0zlnxq57s0egb
Add --pidfile option to stop-loggerhead.

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
33
31
 
34
32
 
35
33
def command_line_parser():
37
35
    parser.set_defaults(
38
36
        user_dirs=False,
39
37
        show_version=False,
40
 
        log_folder=None,
41
38
        )
42
39
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
43
40
                      help="Serve user directories as ~user.")
44
41
    parser.add_option("--trunk-dir", metavar="DIR",
45
42
                      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")
57
43
    parser.add_option("--version", action="store_true", dest="show_version",
58
44
                      help="Print the software version and exit")
59
45
    return parser
60
46
 
61
47
 
62
48
def main(args):
 
49
    logging.basicConfig()
 
50
    logging.getLogger().setLevel(logging.DEBUG)
 
51
 
63
52
    parser = command_line_parser()
64
53
    (options, args) = parser.parse_args(sys.argv[1:])
65
54
 
82
71
    if options.trunk_dir and not options.user_dirs:
83
72
        print "--trunk-dir is only valid with --user-dirs"
84
73
        sys.exit(1)
85
 
        
86
 
    if options.reload:
87
 
        if Reloader.is_installed():
88
 
            Reloader.install()
89
 
        else:
90
 
            return Reloader.restart_with_reloader()
91
74
 
92
75
    if options.user_dirs:
93
76
        if not options.trunk_dir:
96
79
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
97
80
    else:
98
81
        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)
116
82
    app = HTTPExceptionHandler(app)
117
 
    app = TransLogger(app, logger=logger)
118
 
 
119
 
    if not options.user_prefix:
120
 
        prefix = '/'
121
 
    else:
122
 
        prefix = options.user_prefix
 
83
    app = TransLogger(app)
123
84
 
124
85
    try:
125
86
        from paste.deploy.config import PrefixMiddleware
126
87
    except ImportError:
127
88
        pass
128
89
    else:
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)
 
90
        app = PrefixMiddleware(app)
 
91
 
 
92
    httpserver.serve(app, host='0.0.0.0', port='8080')
142
93
 
143
94
 
144
95
if __name__ == "__main__":