X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Server.py;h=881419045cdfb57a77d971995808ded4f1efe706;hb=refs%2Fheads%2Fplcapi-nova;hp=685565f12c5fa8077e8c9a2af66d7ef342b4471d;hpb=ab47bdf1d0df67060958bb3702ed7a94690d3902;p=plcapi.git diff --git a/Server.py b/Server.py index 685565f..8814190 100755 --- a/Server.py +++ b/Server.py @@ -13,12 +13,16 @@ from optparse import OptionParser from gevent import pywsgi # Append PLC to the system path sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0]))) -#from PLC.API import PLCAPI +from PLC.API import PLCAPI +from PLC.Config import Config +from PLC.Logger import logger class App: def __init__(self, api=None): + if not api: + api = PLCAPI() self.api = api def __call__(self, *args, **kwds): @@ -46,11 +50,11 @@ class App: def do_post(self, env, start_response): try: - request_size = int(environ.get('CONTENT_LENGTH', 0)) + request_size = int(env.get('CONTENT_LENGTH', 0)) except (ValueError): request_size = 0 - request = environ['wsgi.input'].read(request_size) - client_address = environ['REMOTE_ADDR'] + request = env['wsgi.input'].read(request_size) + client_address = env['REMOTE_ADDR'] try: response = self.api.handle(client_address, request) @@ -60,6 +64,7 @@ class App: response = "'