← 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 23:12:59 UTC
  • mfrom: (221 trunk)
  • mto: (217.1.9 logging)
  • mto: This revision was merged to the branch mainline in revision 226.
  • Revision ID: guillo.gonzo@gmail.com-20080910231259-4wnfmu30f4n90w6x
 * merge with trunk (resolve conflicts in NEWS and serve-branches)

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
31
33
 
32
34
 
33
35
def command_line_parser():
35
37
    parser.set_defaults(
36
38
        user_dirs=False,
37
39
        show_version=False,
 
40
        log_folder=None,
38
41
        )
39
42
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
40
43
                      help="Serve user directories as ~user.")
46
49
                      help="Host Loggerhead should listen on.")
47
50
    parser.add_option("--prefix", dest="user_prefix",
48
51
                      help="Specify host prefix.")
 
52
    parser.add_option("--reload", action="store_true", dest="reload",
 
53
                      help="Restarts the application when changing python"
 
54
                           " files. Only used for development purposes.")
 
55
    parser.add_option('--log-folder', dest="log_folder", 
 
56
                      type=str, help="The directory to place log files")
49
57
    parser.add_option("--version", action="store_true", dest="show_version",
50
58
                      help="Print the software version and exit")
51
59
    return parser
52
60
 
53
61
 
54
62
def main(args):
55
 
    logging.basicConfig()
56
 
    logging.getLogger().setLevel(logging.DEBUG)
57
 
 
58
63
    parser = command_line_parser()
59
64
    (options, args) = parser.parse_args(sys.argv[1:])
60
65
 
77
82
    if options.trunk_dir and not options.user_dirs:
78
83
        print "--trunk-dir is only valid with --user-dirs"
79
84
        sys.exit(1)
 
85
        
 
86
    if options.reload:
 
87
        if Reloader.is_installed():
 
88
            Reloader.install()
 
89
        else:
 
90
            return Reloader.restart_with_reloader()
80
91
 
81
92
    if options.user_dirs:
82
93
        if not options.trunk_dir:
85
96
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
86
97
    else:
87
98
        app = BranchesFromFileSystemRoot(path)
 
99
    
 
100
    # setup_logging()
 
101
    logging.basicConfig()
 
102
    logging.getLogger('').setLevel(logging.DEBUG)
 
103
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
 
104
    if options.log_folder:
 
105
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
 
106
    else:
 
107
        logfile_path = 'serve-branches.log'
 
108
    logfile = logging.FileHandler(logfile_path, 'a')
 
109
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
 
110
                                  ' %(message)s')
 
111
    logfile.setFormatter(formatter)
 
112
    logfile.setLevel(logging.DEBUG)
 
113
    logger.addHandler(logfile)
 
114
    # setup_logging() #end
 
115
    app = ErrorHandlerApp(app)
88
116
    app = HTTPExceptionHandler(app)
89
 
    app = TransLogger(app)
 
117
    app = TransLogger(app, logger=logger)
90
118
 
91
119
    if not options.user_prefix:
92
120
        prefix = '/'