diff options
Diffstat (limited to 'pbserver.py')
| -rwxr-xr-x | pbserver.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pbserver.py b/pbserver.py index d1fcc32..a1da5d5 100755 --- a/pbserver.py +++ b/pbserver.py @@ -69,13 +69,13 @@ def format_im_data(im, insert_url="NULL"): db.insert_cmd( date=im._now, remote_addr=request.environ.get('REMOTE_ADDR', "NULL"), - username=im.params.get('username', "NULL"), + username=im.params.username or "NULL", url=insert_url, directory=directory, oldfile="NULL", newfile=im.filename, dataobj=";".join(im.commands), - cmd=json.dumps(im.params), + cmd=json.dumps(dict(im.params)), tag=im.tag, ) return json.dumps({ @@ -85,6 +85,7 @@ def format_im_data(im, insert_url="NULL"): 'height' : "{}px".format(dimensions[1]), }) except Exception as e: + sys.stderr.write("Problem sending to database or s3\n") sys.stderr.write(str(e)) raise; @@ -141,7 +142,7 @@ def breaker(): try: im = Breaker(**(dict(request.forms))) im.create(); - return return_image(im, im.params['url']) + return return_image(im, im.params.url) except Exception as e: sys.stderr.write(str(e)) return json.dumps({ 'error' : 'Request could not be processed' }) |
