1 files changed, 14 insertions, 13 deletions
diff --git a/osdf/apps/baseapp.py b/osdf/apps/baseapp.py
index cfa7e5d..fd94c11 100644
--- a/osdf/apps/baseapp.py
+++ b/osdf/apps/baseapp.py
@@ -27,18 +27,17 @@ import time
 import traceback
 from optparse import OptionParser
 
-import pydevd
-from flask import Flask, request, Response, g
-from requests import RequestException
-from schematics.exceptions import DataError
-
 import osdf.adapters.aaf.sms as sms
 import osdf.operation.responses
+import pydevd
+from flask import Flask, request, Response, g
 from osdf.config.base import osdf_config
 from osdf.logging.osdf_logging import error_log, debug_log
 from osdf.operation.error_handling import request_exception_to_json_body, internal_error_message
 from osdf.operation.exceptions import BusinessException
-from osdf.utils.mdc_utils import clear_mdc, mdc_from_json, default_mdc
+from osdf.utils.mdc_utils import clear_mdc, mdc_from_json, default_mdc, get_request_id
+from requests import RequestException
+from schematics.exceptions import DataError
 
 ERROR_TEMPLATE = osdf.ERROR_TEMPLATE
 
@@ -89,18 +88,20 @@ def handle_data_error(e):
 
 @app.before_request
 def log_request():
-    g.request_start = time.clock()
-    if request.get_json():
-
-        request_json = request.get_json()
-        g.request_id = request_json['requestInfo']['requestId']
-        mdc_from_json(request_json)
+    g.request_start = time.process_time()
+    if request.data:
+        if request.get_json():
+            request_json = request.get_json()
+            g.request_id = get_request_id(request_json)
+            mdc_from_json(request_json)
+        else:
+            g.request_id = "N/A"
+            default_mdc()
     else:
         g.request_id = "N/A"
         default_mdc()
 
 
-
 @app.after_request
 def log_response(response):
     clear_mdc()