moksha/middleware/connector.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit 4bacdedbe5fd1ba72f274f44da19cdd2cebffa09 Author: John (J5) Palmieri johnp@redhat.com Date: Wed Jul 27 16:52:11 2011 -0400
make profiling output json friendly
diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index 44c4f39..b9389e1 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -22,6 +22,7 @@ import urllib import time import os.path import threading +import json
from paste.deploy.converters import asbool from webob import Request, Response @@ -76,7 +77,7 @@ class MokshaConnectorMiddleware(object): # output profiling data file_name = os.path.join(directory, prof_file_name) f = open(file_name, 'w') - f.write("{'id': %s, 'start_time': %s, 'callback_start_time': %s, 'end_time': %s}" + f.write('{"id": "%s", "start_time": %s, "callback_start_time": %s, "end_time": %s}' % (profile_id, p['start_time'], p['callback_start_time'], p['end_time'])) f.close() return Response('{}')(environ, start_response) @@ -186,8 +187,8 @@ class MokshaConnectorMiddleware(object): # output call info file_name = os.path.join(directory, info_file_name) f = open(file_name, 'w') - f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s, 'ip': '%s', 'timestamp': %f, 'id_counter': %i, 'id': %s}" - % (conn_name, op, path, str(remote_params), ip, timestamp, prof_id_counter, profile_id)) + f.write('{"name": "%s", "op": "%s", "path": "%s", "remote_params": %s, "ip": "%s", "timestamp": %f, "id_counter": %i, "id": "%s"}' + % (conn_name, op, path, json.dumps(remote_params), ip, timestamp, prof_id_counter, profile_id)) f.close()
# in order to get the results back we need to pass an object
moksha-commits@lists.fedorahosted.org