← 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.")
42
43
                      help="The directory that contains the trunk branches.")
43
44
    parser.add_option("--version", action="store_true", dest="show_version",
44
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")
45
48
    return parser
46
49
 
47
50
 
48
51
def main(args):
49
 
    logging.basicConfig()
50
 
    logging.getLogger().setLevel(logging.DEBUG)
51
 
 
52
52
    parser = command_line_parser()
53
53
    (options, args) = parser.parse_args(sys.argv[1:])
54
54
 
79
79
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
80
80
    else:
81
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)
82
99
    app = HTTPExceptionHandler(app)
83
 
    app = TransLogger(app)
 
100
    app = TransLogger(app, logger=logger)
 
101
 
84
102
 
85
103
    try:
86
104
        from paste.deploy.config import PrefixMiddleware