From 97d3eebff6a8f597a4209331b5dc0df132292a8e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Sat, 12 Oct 2013 18:04:27 -0400 Subject: [PATCH] Actually have httpapi able to start calling into the plugin api --- confluent/httpapi.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/confluent/httpapi.py b/confluent/httpapi.py index 68b3472b..22e54e05 100644 --- a/confluent/httpapi.py +++ b/confluent/httpapi.py @@ -5,8 +5,9 @@ # shillinabox javascript import base64 import Cookie -import confluent.console as console import confluent.auth as auth +import confluent.console as console +import confluent.pluginapi as pluginapi import confluent.util as util import eventlet import json @@ -186,8 +187,10 @@ def resourcehandler(env, start_response): rsp = json.dumps({'session': querydict['session'], 'data': 'DECODEERROR'}) start_response('200 OK', headers) return [rsp] - start_response('404 Not Found', headers) - return ["404 Unrecognized resource"] + else: + pluginapi.handle_path(env['PATH_INFO'], 'retrieve', cfgmgr) + start_response('404 Not Found', headers) + return ["404 Unrecognized resource"] def serve():