Unify currentRequest and sessionData structures

lib/logger.js

@@ -131,10 +131,10 @@ function close() {
 
 
 function flatten(details) {
-  if (details.currentRequest) {
-    details.deviceId = details.currentRequest.sessionData.deviceId;
-    details.remoteAddress = details.currentRequest.httpRequest.connection.remoteAddress;
-    delete details.currentRequest;
+  if (details.sessionContext) {
+    details.deviceId = details.sessionContext.deviceId;
+    details.remoteAddress = details.sessionContext.httpRequest.connection.remoteAddress;
+    delete details.sessionContext;
   }
 
   if (details.exception) {
@@ -149,30 +149,31 @@ function flatten(details) {
     delete details.task;
   }
 
-  if (details.acsRequest) {
-    details.acsRequestName = details.acsRequest.type;
-    if (details.acsRequest.commandKey)
-      details.acsRequestCommandKey = details.acsRequest.commandKey;
-    delete details.acsRequest;
-  }
-
-  if (details.cpeRequest) {
-    if (details.cpeRequest.type === "Inform") {
-      details.informEvent = details.cpeRequest.event.join(",");
-      details.informRetryCount = details.cpeRequest.retryCount;
+  if (details.rpc) {
+    if (details.rpc.acsRequest) {
+      details.acsRequestId = details.rpc.id;
+      details.acsRequestName = details.rpc.acsRequest.name;
+      if (details.rpc.acsRequest.commandKey)
+        details.acsRequestCommandKey = details.rpc.acsRequest.commandKey;
     }
-    else {
-      details.cpeRequestName = details.cpeRequest.type;
-      if (details.cpeRequest.commandKey)
-        details.cpeRequestCommandKey = details.cpeRequest.commandKey;
+    else if (details.rpc.cpeRequest) {
+      details.cpeRequestId = details.rpc.id;
+      if (details.rpc.cpeRequest.name === "Inform") {
+        details.informEvent = details.rpc.cpeRequest.event.join(",");
+        details.informRetryCount = details.rpc.cpeRequest.retryCount;
+      }
+      else {
+        details.cpeRequestName = details.rpc.cpeRequest.type;
+        if (details.rpc.cpeRequest.commandKey)
+          details.cpeRequestCommandKey = details.rpc.cpeRequest.commandKey;
+      }
     }
-    delete details.cpeRequest;
-  }
-
-  if (details.cpeFault) {
-    details.cpeFaultCode = details.cpeFault.faultCode;
-    details.cpeFaultString = details.cpeFault.faultString;
-    delete details.cpeFault;
+    else if (details.rpc.cpeFault) {
+      details.acsRequestId = details.rpc.id;
+      details.cpeFaultCode = details.rpc.cpeFault.faultCode;
+      details.cpeFaultString = details.rpc.cpeFault.faultString;
+    }
+    delete details.rpc;
   }
 
   if (details.fault) {
@@ -180,6 +181,7 @@ function flatten(details) {
     details.faultMessage = details.fault.message;
     delete details.fault;
   }
+
   return details;
 }