backend/satellite_exporter/satexport.py | 11 ++++++++---
backend/server/apacheUploadServer.py | 10 +++++-----
backend/wsgi/package_push.py | 4 +++-
backend/wsgi/package_upload.py | 4 +++-
backend/wsgi/sat_dump.py | 4 +++-
backend/wsgi/wsgiHandler.py | 18 +++---------------
proxy/proxy/wsgi/xmlrpc.py | 4 +++-
proxy/proxy/wsgi/xmlrpc_redirect.py | 5 ++++-
8 files changed, 32 insertions(+), 28 deletions(-)
New commits:
commit cc8441d4daf91aa6cbd94355ce74f6303a16a740
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 23:28:14 2010 +0200
simplified wsgiHandler.get_handle()
diff --git a/backend/wsgi/package_push.py b/backend/wsgi/package_push.py
index ea8b435..3aeef13 100644
--- a/backend/wsgi/package_push.py
+++ b/backend/wsgi/package_push.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response,
"package_push","server.upload.package-push", type="upload")
+ return wsgiHandler.handle(environ, start_response,
+ "package_push",
"server.upload.package-push",
+ "server.apacheUploadServer")
diff --git a/backend/wsgi/package_upload.py b/backend/wsgi/package_upload.py
index 22c03c9..78beef4 100644
--- a/backend/wsgi/package_upload.py
+++ b/backend/wsgi/package_upload.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response,
"package","server.upload.package", type="upload")
+ return wsgiHandler.handle(environ, start_response,
+ "package", "server.upload.package",
+ "server.apacheUploadServer")
diff --git a/backend/wsgi/sat_dump.py b/backend/wsgi/sat_dump.py
index d2104aa..f934b68 100644
--- a/backend/wsgi/sat_dump.py
+++ b/backend/wsgi/sat_dump.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "non_auth_dumper",
"server.satexport.internal", type='exporter')
+ return wsgiHandler.handle(environ, start_response,
+ "non_auth_dumper",
"server.satexport.internal",
+ "satellite_exporter.satexport")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 8ee6763..6879b48 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -19,7 +19,7 @@ from wsgi import wsgiRequest
from common import log_debug
-def handle(environ, start_response, server, component_type, type="normal"):
+def handle(environ, start_response, server, component_type,
type="server.apacheServer"):
#wsgi seems to capitalize incoming headers and add HTTP- to the front :/
# so we strip out the first 5 letters, and transform it into what we want.
replacements = {'_':'-', 'Rhn':'RHN',
'Md5Sum':'MD5sum', 'Xml':'XML'}
@@ -64,18 +64,6 @@ def handle(environ, start_response, server, component_type,
type="normal"):
return req.output
def get_handle(type, name, init=0):
- if type == 'upload':
- from server import apacheUploadServer
- return apacheUploadServer.HandlerWrap(name)
- #the sat export module doesn't provide a nice server module
- elif type == 'exporter':
- from satellite_exporter import satexport
- return satexport.HandlerWrap(name)
- elif type == 'proxy':
- from proxy import apacheServer
- return apacheServer.HandlerWrap(name, init=init)
- else:
- from server import apacheServer
- return apacheServer.HandlerWrap(name, init=init)
-
+ handler_module = __import__(type, globals(), locals(), ['HandlerWrap'])
+ return handler_module.HandlerWrap(name, init)
diff --git a/proxy/proxy/wsgi/xmlrpc.py b/proxy/proxy/wsgi/xmlrpc.py
index 33bfc73..eca662e 100644
--- a/proxy/proxy/wsgi/xmlrpc.py
+++ b/proxy/proxy/wsgi/xmlrpc.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response,
"broker","proxy.broker", "proxy")
+ return wsgiHandler.handle(environ, start_response,
+ "broker", "proxy.broker",
+ "proxy.apacheServer")
diff --git a/proxy/proxy/wsgi/xmlrpc_redirect.py b/proxy/proxy/wsgi/xmlrpc_redirect.py
index b734169..60034f6 100644
--- a/proxy/proxy/wsgi/xmlrpc_redirect.py
+++ b/proxy/proxy/wsgi/xmlrpc_redirect.py
@@ -17,4 +17,7 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response,
"redirect","proxy.redirect", "proxy")
+ return wsgiHandler.handle(environ, start_response,
+ "redirect", "proxy.redirect",
+ "proxy.apacheServer")
+
commit 356bddff66b3f7c50ff06f7062d8d111c3f189ff
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 22:52:16 2010 +0200
made satexport compatible with apacheServer
diff --git a/backend/satellite_exporter/satexport.py
b/backend/satellite_exporter/satexport.py
index 84957ce..8fca481 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -241,6 +241,11 @@ class FunctionRetrievalError(Exception):
pass
apache_server = ApacheServer()
-headerParserHandler = apache_server.headerParserHandler
-handler = apache_server.handler
-cleanupHandler = apache_server.cleanupHandler
+class HandlerWrap:
+ def __init__(self, name, init=0):
+ return getattr(apache_server, name)
+
+### Instantiate external entry points:
+headerParserHandler = HandlerWrap("headerParserHandler")
+handler = HandlerWrap("handler")
+cleanupHandler = HandlerWrap("cleanupHandler")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 7222428..8ee6763 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -70,7 +70,7 @@ def get_handle(type, name, init=0):
#the sat export module doesn't provide a nice server module
elif type == 'exporter':
from satellite_exporter import satexport
- return getattr(satexport, name)
+ return satexport.HandlerWrap(name)
elif type == 'proxy':
from proxy import apacheServer
return apacheServer.HandlerWrap(name, init=init)
commit 3d9dd333fe556e77932193e34cf0a1374653faa0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 22:09:02 2010 +0200
made apacheUploadServer compatible with apacheServer
diff --git a/backend/server/apacheUploadServer.py b/backend/server/apacheUploadServer.py
index fd8acf7..b1c6aad 100644
--- a/backend/server/apacheUploadServer.py
+++ b/backend/server/apacheUploadServer.py
@@ -24,7 +24,7 @@ from common import CFG, initCFG, log_debug, log_error, log_setreq,
initLOG, \
Traceback, rhnFault, rhnFlags
from server import apacheServer, rhnImport
-class UploadHandlerWrap(apacheServer.HandlerWrap):
+class HandlerWrap(apacheServer.HandlerWrap):
def get_handler_factory(self, req):
return UploadHandler
@@ -146,7 +146,7 @@ Error Class Info: %s
string.rstrip(exception.arrayText))
### Instantiate external entry points:
-HeaderParserHandler = UploadHandlerWrap("headerParserHandler", init=1)
-Handler = UploadHandlerWrap("handler")
-CleanupHandler = UploadHandlerWrap("cleanupHandler")
-LogHandler = UploadHandlerWrap("logHandler")
+HeaderParserHandler = HandlerWrap("headerParserHandler", init=1)
+Handler = HandlerWrap("handler")
+CleanupHandler = HandlerWrap("cleanupHandler")
+LogHandler = HandlerWrap("logHandler")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 9f4a09f..7222428 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -66,7 +66,7 @@ def handle(environ, start_response, server, component_type,
type="normal"):
def get_handle(type, name, init=0):
if type == 'upload':
from server import apacheUploadServer
- return apacheUploadServer.UploadHandlerWrap(name)
+ return apacheUploadServer.HandlerWrap(name)
#the sat export module doesn't provide a nice server module
elif type == 'exporter':
from satellite_exporter import satexport