Skip to content

Commit

Permalink
Merge pull request #5211 from vkuznet/reqmgr2
Browse files Browse the repository at this point in the history
Reqmgr changes
  • Loading branch information
ticoann committed Jul 28, 2014
2 parents 74bc2bb + 9b30b68 commit c84ad34
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/python/WMCore/REST/Main.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def access(self):
'H': self.host,
'h': remote.name or remote.ip,
'r': request.request_line,
's': response.status.split(" ", 1)[0],
's': response.status,
# request.rfile.rfile.bytes_read is a custom CMS web
# cherrypy patch not always available, hence the test
'i': (getattr(request.rfile, 'rfile', None)
Expand Down
10 changes: 1 addition & 9 deletions src/python/WMCore/ReqMgr/Web/ReqMgrService.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class ReqMgrService(TemplatedPage):
"""
Request Manager web service class
"""
def __init__(self, config=None):
def __init__(self, app, config, mount):
print "\n### Configuration:"
print config
self.base = config.base
Expand Down Expand Up @@ -234,14 +234,6 @@ def __init__(self, config=None):
})
self._cache = {}

# TODO:
# for time being use development environment
# this part will be removed in production when we enable
# proper authentication
cherrypy.server.environment = 'development'
cherrypy.server.socket_host = '127.0.0.1'
authz_fake()

# initialize rest API
statedir = '/tmp'
app = RESTMain(config, statedir) # REST application
Expand Down

0 comments on commit c84ad34

Please sign in to comment.