Minor fixes, json logging and newJsonRpcErr

nayarsystems · Sep 22, 2016 · 613b741 · 613b741
1 parent 796ee9f
commit 613b741
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nxsugarpy/errors.py b/nxsugarpy/errors.py
@@ -68,7 +68,7 @@
     ErrPactNotDefined:           "Pact not defined for provided input",
 }
 
-def newJsonRpcErr(code, message, data):
+def newJsonRpcErr(code, message="", data=None):
     return {"code": code, "message": message, "data": data}
 
 def formatAsJsonRpcErr(err):

diff --git a/nxsugarpy/log.py b/nxsugarpy/log.py
@@ -81,13 +81,13 @@ def log(level, path, message, *args, **kwargs):
 
 def logWithFields(level, path, fields, message, *args, **kwargs):
     if _level <= _getLogLevelNum(level):
-        level = level[:4].upper()
         try:
             msg = message.format(*args, **kwargs)
         except:
             msg = "<invalid format> msg[ {0} ] args[ {1} ] kwargs[ {2} ]".format(message, args, kwargs)
         if _jsonEnabled:
             jsonData = json.dumps(fields)
-            print('''{"time": "{time}", "level": "{level}", "path": "{path}", "msg": "{message}", "data": {data}}'''.format(time=strict_rfc3339.now_to_rfc3339_utcoffset(), level=level, path=path, message=msg, data=jsonData), file=sys.stderr)
+            print('{"time": "' + strict_rfc3339.now_to_rfc3339_utcoffset() + '", "level": "' + level + '", "path": "' + path + '", "msg": "' + msg + '", "data": ' + jsonData + '}', file=sys.stderr)
         else:
+            level = level[:4].upper()
             print('''[{time}] [{level}] [{path}] {message}'''.format(time=strict_rfc3339.now_to_rfc3339_utcoffset(), level=level, path=path, message=msg), file=sys.stderr)