From 480896bd416d0dfef7716508c6a10144d0fa068e Mon Sep 17 00:00:00 2001 From: Pepper Date: Sun, 27 Sep 2015 03:02:22 -0400 Subject: ready for merge and ready for publish --- lib/server.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/server.py') diff --git a/lib/server.py b/lib/server.py index 3a91632..e41062b 100644 --- a/lib/server.py +++ b/lib/server.py @@ -8,6 +8,7 @@ from paste.translogger import TransLogger sys.path.append("./lib") from pb import * +from param import BadParamError from config import SERVER_HOST, SERVER_PORT class InvalidUsage(Exception): @@ -70,15 +71,12 @@ class Server(object): pb.db_send() return jsonify(pb.file_dict()) - #FIXME handle BadParamsError and PbError separately - except Exception as e: - sys.stderr.write("%s failure" % pb_class.__name__) - sys.stderr.write("params:\n") - sys.stderr.write(str(e)) + except BadParamError: for i in request_form.keys(): - sys.stderr.write("{}:{}\n".format(i, request_form[i])) - raise - return jsonify({'error' : 'Request could not be processed'}) + sys.stderr.write('\'%s\':\'%s\'\n' % (i, request_form[i] or None)) + return jsonify({'error' : 'Bad Params'}) + except PbProcessError: + return jsonify({'error' : 'Problem with server-side processing' }) def run(self, host=SERVER_HOST, port=SERVER_PORT): self.app.run(host=host, port=port) -- cgit v1.2.3-70-g09d2