~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Martin Albisetti
  • Date: 2008-09-10 22:53:39 UTC
  • mfrom: (219.1.3 reloader)
  • Revision ID: argentina@gmail.com-20080910225339-p987y5hgtxrq8p5c
Add --reload option to restart LH automatically when developing. (Guillermo Gonzalez)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
33
32
 
34
33
 
35
34
def command_line_parser():
37
36
    parser.set_defaults(
38
37
        user_dirs=False,
39
38
        show_version=False,
40
 
        log_folder=None,
41
39
        )
42
40
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
43
41
                      help="Serve user directories as ~user.")
44
42
    parser.add_option("--trunk-dir", metavar="DIR",
45
43
                      help="The directory that contains the trunk branches.")
46
44
    parser.add_option("--port", dest="user_port",
47
 
                      help=("Port Loggerhead should listen on "
48
 
                            "(defaults to 8080)."))
 
45
                      help="Port Loggerhead should listen on (defaults to 8080).")
49
46
    parser.add_option("--host", dest="user_host",
50
47
                      help="Host Loggerhead should listen on.")
51
48
    parser.add_option("--prefix", dest="user_prefix",
52
49
                      help="Specify host prefix.")
53
 
    parser.add_option("--profile", action="store_true", dest="profile",
54
 
                      help="Generate callgrind profile data to "
55
 
                        "%d-stats.callgrind on each request.")
56
50
    parser.add_option("--reload", action="store_true", dest="reload",
57
51
                      help="Restarts the application when changing python"
58
52
                           " files. Only used for development purposes.")
59
 
    parser.add_option('--log-folder', dest="log_folder",
60
 
                      type=str, help="The directory to place log files in.")
61
53
    parser.add_option("--version", action="store_true", dest="show_version",
62
54
                      help="Print the software version and exit")
63
55
    return parser
64
56
 
65
57
 
66
58
def main(args):
 
59
    logging.basicConfig()
 
60
    logging.getLogger().setLevel(logging.DEBUG)
 
61
 
67
62
    parser = command_line_parser()
68
63
    (options, args) = parser.parse_args(sys.argv[1:])
69
64
 
86
81
    if options.trunk_dir and not options.user_dirs:
87
82
        print "--trunk-dir is only valid with --user-dirs"
88
83
        sys.exit(1)
89
 
 
 
84
        
90
85
    if options.reload:
91
86
        if Reloader.is_installed():
92
87
            Reloader.install()
100
95
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
101
96
    else:
102
97
        app = BranchesFromFileSystemRoot(path)
103
 
 
104
 
    # setup_logging()
105
 
    logging.basicConfig()
106
 
    logging.getLogger('').setLevel(logging.DEBUG)
107
 
    logger = getattr(app, 'log', logging.getLogger('loggerhead'))
108
 
    if options.log_folder:
109
 
        logfile_path = os.path.join(options.log_folder, 'serve-branches.log')
110
 
    else:
111
 
        logfile_path = 'serve-branches.log'
112
 
    logfile = logging.FileHandler(logfile_path, 'a')
113
 
    formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
114
 
                                  ' %(message)s')
115
 
    logfile.setFormatter(formatter)
116
 
    logfile.setLevel(logging.DEBUG)
117
 
    logger.addHandler(logfile)
118
 
    # setup_logging() #end
119
 
    app = ErrorHandlerApp(app)
120
98
    app = HTTPExceptionHandler(app)
121
 
    app = TransLogger(app, logger=logger)
122
 
    if options.profile:
123
 
        from loggerhead.middleware.profile import LSProfMiddleware
124
 
        app = LSProfMiddleware(app)
 
99
    app = TransLogger(app)
125
100
 
126
101
    if not options.user_prefix:
127
102
        prefix = '/'
134
109
        pass
135
110
    else:
136
111
        app = PrefixMiddleware(app, prefix=prefix)
137
 
 
 
112
    
138
113
    if not options.user_port:
139
114
        port = '8080'
140
115
    else: