← 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:33:20 UTC
  • mto: (197.1.9 pathargs)
  • mto: This revision was merged to the branch mainline in revision 202.
  • Revision ID: jelmer@samba.org-20080806183320-6llann0k480dlb9y
add --log-folder option.

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