← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Guillermo Gonzalez
  • Date: 2008-09-09 03:47:24 UTC
  • mto: (217.1.9 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080909034724-dm7wj8yf22y86fkh
 * new apps module: "error" and ErrorHandlerApp middleware
 * new error_ui controller 
 * added trivial template: error.pt
 * serve-branches:
  - added --log-folder option
  - reorganized logging setup (as first step towards move it into trace.py)
 * exception handling in BranchWSGIApp.app 

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
 
 
 
31
from loggerhead.apps.error import ErrorHandlerApp
32
32
 
33
33
def command_line_parser():
34
34
    parser = OptionParser("%prog [options] <path>")
35
35
    parser.set_defaults(
36
36
        user_dirs=False,
37
37
        show_version=False,
 
38
        log_folder=None,
38
39
        )
39
40
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
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.")
43
 
    parser.add_option("--port", dest="user_port",
44
 
                      help="Port Loggerhead should listen on (defaults to 8080).")
45
 
    parser.add_option("--host", dest="user_host",
46
 
                      help="Host Loggerhead should listen on.")
47
 
    parser.add_option("--prefix", dest="user_prefix",
48
 
                      help="Specify host prefix.")
49
44
    parser.add_option("--version", action="store_true", dest="show_version",
50
45
                      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")
51
48
    return parser
52
49
 
53
50
 
54
51
def main(args):
55
 
    logging.basicConfig()
56
 
    logging.getLogger().setLevel(logging.DEBUG)
57
 
 
58
52
    parser = command_line_parser()
59
53
    (options, args) = parser.parse_args(sys.argv[1:])
60
54
 
85
79
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
86
80
    else:
87
81
        app = BranchesFromFileSystemRoot(path)
 
82
    
 
83
    # setup_logging()
 
84
    logging.basicConfig()
 
85
    logging.getLogger('').setLevel(logging.DEBUG)
 
86
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
87
    if options.log_folder:
 
88
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
89
    else:
 
90
        logfile_path = 'serve-branches.log'
 
91
    logfile = logging.FileHandler(logfile_path, 'a')
 
92
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
93
                                  ' %(message)s')
 
94
    logfile.setFormatter(formatter)
 
95
    logfile.setLevel(logging.DEBUG)
 
96
    logger.addHandler(logfile)
 
97
    # setup_logging() #end
 
98
    app = ErrorHandlerApp(app)
88
99
    app = HTTPExceptionHandler(app)
89
 
    app = TransLogger(app)
 
100
    app = TransLogger(app, logger=logger)
90
101
 
91
 
    if not options.user_prefix:
92
 
        prefix = '/'
93
 
    else:
94
 
        prefix = options.user_prefix
95
102
 
96
103
    try:
97
104
        from paste.deploy.config import PrefixMiddleware
98
105
    except ImportError:
99
106
        pass
100
107
    else:
101
 
        app = PrefixMiddleware(app, prefix=prefix)
102
 
    
103
 
    if not options.user_port:
104
 
        port = '8080'
105
 
    else:
106
 
        port = options.user_port
107
 
 
108
 
    if not options.user_host:
109
 
        host = '0.0.0.0'
110
 
    else:
111
 
        host = options.user_host
112
 
 
113
 
    httpserver.serve(app, host=host, port=port)
 
108
        app = PrefixMiddleware(app)
 
109
 
 
110
    httpserver.serve(app, host='0.0.0.0', port='8080')
114
111
 
115
112
 
116
113
if __name__ == "__main__":