Configure LWS logs with KVS log level (#2118)

Author: sirknightj

src/source/Signaling/LwsApiCalls.c

@@ -27,7 +27,6 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
     PSingleListNode pCurNode;
     UINT64 item, serverTime;
     UINT32 headerCount;
-    UINT32 logLevel;
     PRequestHeader pRequestHeader;
     PSignalingClient pSignalingClient = NULL;
     BOOL locked = FALSE;
@@ -37,7 +36,6 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
     PStateMachineState pStateMachineState;
     BOOL skewMapContains = FALSE;
 
-    UNUSED_PARAM(logLevel);
     DLOGV("HTTPS callback with reason %d", reason);
 
     // Early check before accessing the custom data field to see if we are interested in processing the message
@@ -58,7 +56,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
     customData = lws_get_opaque_user_data(wsi);
     pLwsCallInfo = (PLwsCallInfo) customData;
 
-    lws_set_log_level(LLL_NOTICE | LLL_WARN | LLL_ERR, NULL);
+    CHK_STATUS(configureLwsLogging(loggerGetLogLevel()));
 
     CHK(pLwsCallInfo != NULL && pLwsCallInfo->pSignalingClient != NULL && pLwsCallInfo->pSignalingClient->pLwsContext != NULL &&
             pLwsCallInfo->callInfo.pRequestInfo != NULL && pLwsCallInfo->protocolIndex == PROTOCOL_INDEX_HTTPS,
@@ -77,8 +75,6 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
     pRequestInfo = pLwsCallInfo->callInfo.pRequestInfo;
     pBuffer = pLwsCallInfo->buffer + LWS_PRE;
 
-    logLevel = loggerGetLogLevel();
-
     MUTEX_LOCK(pSignalingClient->lwsServiceLock);
     locked = TRUE;
 
@@ -319,7 +315,7 @@ INT32 lwsWssCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason, P
     customData = lws_get_opaque_user_data(wsi);
     pLwsCallInfo = (PLwsCallInfo) customData;
 
-    lws_set_log_level(LLL_NOTICE | LLL_WARN | LLL_ERR, NULL);
+    CHK_STATUS(configureLwsLogging(loggerGetLogLevel()));
 
     CHK(pLwsCallInfo != NULL && pLwsCallInfo->pSignalingClient != NULL && pLwsCallInfo->pSignalingClient->pOngoingCallInfo != NULL &&
             pLwsCallInfo->pSignalingClient->pLwsContext != NULL && pLwsCallInfo->pSignalingClient->pOngoingCallInfo->callInfo.pRequestInfo != NULL &&
@@ -2426,3 +2422,32 @@ STATUS wakeLwsServiceEventLoop(PSignalingClient pSignalingClient, UINT32 protoco
     LEAVES();
     return retStatus;
 }
+
+STATUS configureLwsLogging(UINT32 kvsLogLevel)
+{
+    ENTERS();
+    STATUS retStatus = STATUS_SUCCESS;
+
+    INT32 lws_levels = 0;
+
+    if (kvsLogLevel <= LOG_LEVEL_ERROR) {
+        lws_levels |= LLL_ERR;
+    }
+    if (kvsLogLevel <= LOG_LEVEL_WARN) {
+        lws_levels |= LLL_WARN;
+    }
+    if (kvsLogLevel <= LOG_LEVEL_INFO || kvsLogLevel == LOG_LEVEL_PROFILE) {
+        lws_levels |= LLL_NOTICE;
+    }
+    if (kvsLogLevel <= LOG_LEVEL_DEBUG) {
+        lws_levels |= LLL_INFO;
+    }
+
+    lws_set_log_level(lws_levels, NULL);
+
+CleanUp:
+    CHK_LOG_ERR(retStatus);
+
+    LEAVES();
+    return retStatus;
+}

src/source/Signaling/LwsApiCalls.h

@@ -279,6 +279,7 @@ STATUS getMessageTypeFromString(PCHAR, UINT32, SIGNALING_MESSAGE_TYPE*);
 PCHAR getMessageTypeInString(SIGNALING_MESSAGE_TYPE);
 STATUS wakeLwsServiceEventLoop(PSignalingClient, UINT32);
 STATUS terminateConnectionWithStatus(PSignalingClient, SERVICE_CALL_RESULT);
+STATUS configureLwsLogging(UINT32 kvsLogLevel);
 
 #ifdef __cplusplus
 }

src/source/Signaling/Signaling.c

@@ -163,6 +163,8 @@ STATUS createSignalingSync(PSignalingClientInfoInternal pClientInfo, PChannelInf
     // Create the ongoing message list
     CHK_STATUS(stackQueueCreate(&pSignalingClient->pMessageQueue));
 
+    CHK_STATUS(configureLwsLogging(loggerGetLogLevel()));
+
     pSignalingClient->pLwsContext = lws_create_context(&creationInfo);
     CHK(pSignalingClient->pLwsContext != NULL, STATUS_SIGNALING_LWS_CREATE_CONTEXT_FAILED);