From e080240aeab57648af2b5d6f7eb0cc51e4c1f4fe Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Sun, 13 Jul 2014 22:37:43 -0400 Subject: Requests content is now serialized in JSON --- browserlogger.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/browserlogger.py b/browserlogger.py index 1bd216d..e9d9c8e 100644 --- a/browserlogger.py +++ b/browserlogger.py @@ -1,7 +1,7 @@ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler from threading import Thread from datetime import datetime -from urlparse import parse_qs +from json import loads from models import BrowserEvent @@ -10,16 +10,15 @@ class MyHandler(BaseHTTPRequestHandler): def do_POST(self): length = int(self.headers['Content-Length']) - data = parse_qs(self.rfile.read(length)) - data = {key: data[key][0].decode("utf8") for key in data.iterkeys()} - time = datetime.utcfromtimestamp(int(data["time"]) / 1000.) - if data["url"][0] == "null": - url, title = None, None - else: - try: - url, title = (data["url"], data["title"]) - except KeyError: - print data + data = loads(self.rfile.read(length)) + try: + time = datetime.utcfromtimestamp(int(data["time"]) / 1000.) + except KeyError: + print data + try: + url, title = (data["url"], data["title"]) + except KeyError: + print data event = BrowserEvent(time=time, url=url, title=title, browser_key=data["key"]) self.server.logger.info(event) -- cgit v1.2.3-70-g09d2