← 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-10 00:13:18 UTC
  • mfrom: (220 trunk)
  • mto: (217.1.9 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080910001318-78w16x9zl9p7f1k3
 * merge with trunk 

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.")
48
49
                      help="Specify host prefix.")
49
50
    parser.add_option("--version", action="store_true", dest="show_version",
50
51
                      help="Print the software version and exit")
 
52
    parser.add_option('--log-folder', dest="log_folder", 
 
53
                      type=str, help="The directory to place log files")
51
54
    return parser
52
55
 
53
56
 
54
57
def main(args):
55
 
    logging.basicConfig()
56
 
    logging.getLogger().setLevel(logging.DEBUG)
57
 
 
58
58
    parser = command_line_parser()
59
59
    (options, args) = parser.parse_args(sys.argv[1:])
60
60
 
85
85
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
86
86
    else:
87
87
        app = BranchesFromFileSystemRoot(path)
 
88
    
 
89
    # setup_logging()
 
90
    logging.basicConfig()
 
91
    logging.getLogger('').setLevel(logging.DEBUG)
 
92
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
93
    if options.log_folder:
 
94
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
95
    else:
 
96
        logfile_path = 'serve-branches.log'
 
97
    logfile = logging.FileHandler(logfile_path, 'a')
 
98
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
99
                                  ' %(message)s')
 
100
    logfile.setFormatter(formatter)
 
101
    logfile.setLevel(logging.DEBUG)
 
102
    logger.addHandler(logfile)
 
103
    # setup_logging() #end
 
104
    app = ErrorHandlerApp(app)
88
105
    app = HTTPExceptionHandler(app)
89
 
    app = TransLogger(app)
 
106
    app = TransLogger(app, logger=logger)
 
107
 
90
108
 
91
109
    if not options.user_prefix:
92
110
        prefix = '/'