← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to start-loggerhead

[rs=thumper] merge loggerhead trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
start-loggerhead
23
23
import sys
24
24
import urlparse
25
25
 
26
 
from bzrlib.util.configobj import ConfigObj
 
26
from bzrlib.plugin import load_plugins
 
27
from bzrlib.util.configobj.configobj import ConfigObj
27
28
 
28
29
from paste import httpserver
29
30
from paste.httpexceptions import make_middleware
115
116
        def app(environ, start_response, orig=app):
116
117
            environ['SCRIPT_NAME'] = path
117
118
            environ['HTTP_HOST'] = netloc
 
119
            environ['wsgi.url_scheme'] = scheme
118
120
            return orig(environ, start_response)
119
121
 
 
122
    load_plugins()
 
123
 
120
124
    try:
121
125
        httpserver.serve(
122
126
            app, host=server_host, port=server_port,