← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

[rs=mwhudson] Merged the latest and greatest from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
29
29
from loggerhead.apps.filesystem import (
30
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
31
31
from loggerhead.util import Reloader
 
32
from loggerhead.apps.error import ErrorHandlerApp
32
33
 
33
34
 
34
35
def command_line_parser():
36
37
    parser.set_defaults(
37
38
        user_dirs=False,
38
39
        show_version=False,
 
40
        log_folder=None,
39
41
        )
40
42
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
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.")
44
46
    parser.add_option("--port", dest="user_port",
45
 
                      help="Port Loggerhead should listen on (defaults to 8080).")
 
47
                      help=("Port Loggerhead should listen on "
 
48
                            "(defaults to 8080)."))
46
49
    parser.add_option("--host", dest="user_host",
47
50
                      help="Host Loggerhead should listen on.")
48
51
    parser.add_option("--prefix", dest="user_prefix",
49
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.")
50
56
    parser.add_option("--reload", action="store_true", dest="reload",
51
57
                      help="Restarts the application when changing python"
52
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.")
53
61
    parser.add_option("--version", action="store_true", dest="show_version",
54
62
                      help="Print the software version and exit")
55
63
    return parser
56
64
 
57
65
 
58
66
def main(args):
59
 
    logging.basicConfig()
60
 
    logging.getLogger().setLevel(logging.DEBUG)
61
 
 
62
67
    parser = command_line_parser()
63
68
    (options, args) = parser.parse_args(sys.argv[1:])
64
69
 
81
86
    if options.trunk_dir and not options.user_dirs:
82
87
        print "--trunk-dir is only valid with --user-dirs"
83
88
        sys.exit(1)
84
 
        
 
89
 
85
90
    if options.reload:
86
91
        if Reloader.is_installed():
87
92
            Reloader.install()
95
100
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
96
101
    else:
97
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)
98
120
    app = HTTPExceptionHandler(app)
99
 
    app = TransLogger(app)
 
121
    app = TransLogger(app, logger=logger)
 
122
    if options.profile:
 
123
        from loggerhead.middleware.profile import LSProfMiddleware
 
124
        app = LSProfMiddleware(app)
100
125
 
101
126
    if not options.user_prefix:
102
127
        prefix = '/'
109
134
        pass
110
135
    else:
111
136
        app = PrefixMiddleware(app, prefix=prefix)
112
 
    
 
137
 
113
138
    if not options.user_port:
114
139
        port = '8080'
115
140
    else: