← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Albisetti
  • Date: 2008-10-27 08:26:48 UTC
  • mfrom: (233.1.1 absolutepath-fix)
  • Revision ID: argentina@gmail.com-20081027082648-xwu6j9i9887ilvi2
Fix absolutepaths (Matt Nordhoff)

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
29
29
from loggerhead.apps.filesystem import (
30
30
    BranchesFromFileSystemRoot, UserBranchesFromFileSystemRoot)
31
31
from loggerhead.util import Reloader
 
32
from loggerhead.apps.error import ErrorHandlerApp
32
33
 
33
34
 
34
35
def command_line_parser():
36
37
    parser.set_defaults(
37
38
        user_dirs=False,
38
39
        show_version=False,
 
40
        log_folder=None,
39
41
        )
40
42
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
41
43
                      help="Serve user directories as ~user.")
42
44
    parser.add_option("--trunk-dir", metavar="DIR",
43
45
                      help="The directory that contains the trunk branches.")
44
46
    parser.add_option("--port", dest="user_port",
45
 
                      help="Port Loggerhead should listen on (defaults to 8080).")
 
47
                      help=("Port Loggerhead should listen on "
 
48
                            "(defaults to 8080)."))
46
49
    parser.add_option("--host", dest="user_host",
47
50
                      help="Host Loggerhead should listen on.")
48
51
    parser.add_option("--prefix", dest="user_prefix",
50
53
    parser.add_option("--reload", action="store_true", dest="reload",
51
54
                      help="Restarts the application when changing python"
52
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.")
53
58
    parser.add_option("--version", action="store_true", dest="show_version",
54
59
                      help="Print the software version and exit")
55
60
    return parser
56
61
 
57
62
 
58
63
def main(args):
59
 
    logging.basicConfig()
60
 
    logging.getLogger().setLevel(logging.DEBUG)
61
 
 
62
64
    parser = command_line_parser()
63
65
    (options, args) = parser.parse_args(sys.argv[1:])
64
66
 
81
83
    if options.trunk_dir and not options.user_dirs:
82
84
        print "--trunk-dir is only valid with --user-dirs"
83
85
        sys.exit(1)
84
 
        
 
86
 
85
87
    if options.reload:
86
88
        if Reloader.is_installed():
87
89
            Reloader.install()
95
97
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
96
98
    else:
97
99
        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)
98
117
    app = HTTPExceptionHandler(app)
99
 
    app = TransLogger(app)
 
118
    app = TransLogger(app, logger=logger)
100
119
 
101
120
    if not options.user_prefix:
102
121
        prefix = '/'
109
128
        pass
110
129
    else:
111
130
        app = PrefixMiddleware(app, prefix=prefix)
112
 
    
 
131
 
113
132
    if not options.user_port:
114
133
        port = '8080'
115
134
    else: