← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Marius Kruger
  • Date: 2008-09-06 20:17:56 UTC
  • mto: This revision was merged to the branch mainline in revision 219.
  • Revision ID: amanic@gmail.com-20080906201756-ocqnga9vu1uj425t
Add alternative insallation notes and mention the --prefix option in README.txt

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
33
31
 
34
32
 
35
33
def command_line_parser():
37
35
    parser.set_defaults(
38
36
        user_dirs=False,
39
37
        show_version=False,
40
 
        log_folder=None,
41
38
        )
42
39
    parser.add_option("--user-dirs", action="store_true", dest="user_dirs",
43
40
                      help="Serve user directories as ~user.")
44
41
    parser.add_option("--trunk-dir", metavar="DIR",
45
42
                      help="The directory that contains the trunk branches.")
46
43
    parser.add_option("--port", dest="user_port",
47
 
                      help=("Port Loggerhead should listen on "
48
 
                            "(defaults to 8080)."))
 
44
                      help="Port Loggerhead should listen on (defaults to 8080).")
49
45
    parser.add_option("--host", dest="user_host",
50
46
                      help="Host Loggerhead should listen on.")
51
47
    parser.add_option("--prefix", dest="user_prefix",
52
48
                      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
 
    parser.add_option("--reload", action="store_true", dest="reload",
57
 
                      help="Restarts the application when changing python"
58
 
                           " 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
49
    parser.add_option("--version", action="store_true", dest="show_version",
62
50
                      help="Print the software version and exit")
63
51
    return parser
64
52
 
65
53
 
66
54
def main(args):
 
55
    logging.basicConfig()
 
56
    logging.getLogger().setLevel(logging.DEBUG)
 
57
 
67
58
    parser = command_line_parser()
68
59
    (options, args) = parser.parse_args(sys.argv[1:])
69
60
 
87
78
        print "--trunk-dir is only valid with --user-dirs"
88
79
        sys.exit(1)
89
80
 
90
 
    if options.reload:
91
 
        if Reloader.is_installed():
92
 
            Reloader.install()
93
 
        else:
94
 
            return Reloader.restart_with_reloader()
95
 
 
96
81
    if options.user_dirs:
97
82
        if not options.trunk_dir:
98
83
            print "You didn't specify a directory for the trunk directories."
100
85
        app = UserBranchesFromFileSystemRoot(path, options.trunk_dir)
101
86
    else:
102
87
        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
88
    app = HTTPExceptionHandler(app)
121
 
    app = TransLogger(app, logger=logger)
122
 
    if options.profile:
123
 
        from loggerhead.middleware.profile import LSProfMiddleware
124
 
        app = LSProfMiddleware(app)
 
89
    app = TransLogger(app)
125
90
 
126
91
    if not options.user_prefix:
127
92
        prefix = '/'
134
99
        pass
135
100
    else:
136
101
        app = PrefixMiddleware(app, prefix=prefix)
137
 
 
 
102
    
138
103
    if not options.user_port:
139
104
        port = '8080'
140
105
    else: