Merge branch 'develop' of https://github.com/cfreyfh/context.Orion-LD …

…into develop
cfreyfh · Aug 25, 2023 · d18b8b3 · d18b8b3
2 parents c0ecebd + aa4285a
commit d18b8b3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/lib/cache/subCache.cpp b/src/lib/cache/subCache.cpp
@@ -574,6 +574,12 @@ int subCacheMatch
 //
 void subCacheItemStrip(CachedSubscription* cSubP)
 {
+  if (cSubP->subscriptionId != NULL)
+  {
+    free(cSubP->subscriptionId);
+    cSubP->subscriptionId = NULL;
+  }
+
   if (cSubP->description != NULL)
   {
     free(cSubP->description);
@@ -668,12 +674,6 @@ void subCacheItemStrip(CachedSubscription* cSubP)
 */
 void subCacheItemDestroy(CachedSubscription* cSubP)
 {
-  if (cSubP->subscriptionId != NULL)
-  {
-    free(cSubP->subscriptionId);
-    cSubP->subscriptionId = NULL;
-  }
-
   subCacheItemStrip(cSubP);
 
   cSubP->next = NULL;
@@ -746,9 +746,7 @@ CachedSubscription* subCacheItemLookup(const char* tenant, const char* subscript
   while (cSubP != NULL)
   {
     if ((tenantMatch(tenant, cSubP->tenant)) && (strcmp(subscriptionId, cSubP->subscriptionId) == 0))
-    {
       return cSubP;
-    }
 
     cSubP = cSubP->next;
   }

diff --git a/src/lib/logMsg/traceLevels.h b/src/lib/logMsg/traceLevels.h
@@ -97,7 +97,7 @@ typedef enum TraceLevels
   //
   // Misc
   //
-  LmtMongoc = 240,                     // Entire mongoc library
+  LmtMongoc = 230,                     // Entire mongoc library
   LmtSR,                               // Service Routine (whatever it is doing)
   LmtSemaphore,                        // Semaphores
   LmtKjlParse,                         // Trace level start for K libs
@@ -109,6 +109,7 @@ typedef enum TraceLevels
   LmtSql,                              // SQL command for TRoE
   LmtPgPool,                           // Postgres Connection Pool
   LmtSocketService,                    // Socket Service
+
   LmtCurl    = 250,                    // CURL library
   LmtToDo,                             // To Do list
   LmtPatchEntity,                      // Real merge+patch

diff --git a/src/lib/orionld/common/subCacheApiSubscriptionInsert.cpp b/src/lib/orionld/common/subCacheApiSubscriptionInsert.cpp
@@ -57,7 +57,7 @@ extern "C"
 //
 // subCacheItemFill -
 //
-static CachedSubscription* subCacheItemFill
+static void subCacheItemFill
 (
   CachedSubscription*  cSubP,
   KjNode*              apiSubscriptionP,
@@ -309,7 +309,8 @@ static CachedSubscription* subCacheItemFill
         if (mqttParse(url, &mqtts, &mqttUser, &mqttPassword, &mqttHost, &mqttPort, &mqttTopic, &detail) == false)
         {
           LM_E(("Internal Error (unable to parse mqtt URL)"));
-          return NULL;
+          cSubP->isActive = false;
+          return;
         }
 
         if (mqttUser     != NULL) strncpy(cSubP->httpInfo.mqtt.username, mqttUser,     sizeof(cSubP->httpInfo.mqtt.username) - 1);
@@ -385,10 +386,6 @@ static CachedSubscription* subCacheItemFill
 
   if (geoCoordinatesP != NULL)
     cSubP->geoCoordinatesP = kjClone(NULL, geoCoordinatesP);
-
-  subCacheItemInsert(cSubP);
-
-  return cSubP;
 }
 
 
@@ -411,7 +408,9 @@ static CachedSubscription* subCacheApiSubscriptionCreate
 {
   CachedSubscription* cSubP = new CachedSubscription();
 
-  return subCacheItemFill(cSubP, apiSubscriptionP, qTree, geoCoordinatesP, contextP, tenant, showChangesP, sysAttrsP, renderFormat);
+  subCacheItemFill(cSubP, apiSubscriptionP, qTree, geoCoordinatesP, contextP, tenant, showChangesP, sysAttrsP, renderFormat);
+  subCacheItemInsert(cSubP);
+  return cSubP;
 }
 
 
@@ -459,10 +458,12 @@ static CachedSubscription* subCacheApiSubscriptionUpdate
     cSubP->modifiedAt = modifiedAtNode->value.f;  // The new value is in the DB
   }
 
-  cSubP->count      = 0;                        // Not sure ... count+dbCount ...
+  cSubP->count = 0;
 
   subCacheItemStrip(cSubP);
-  return subCacheItemFill(cSubP, apiSubscriptionP, qTree, geoCoordinatesP, contextP, tenant, showChangesP, sysAttrsP, renderFormat);
+  subCacheItemFill(cSubP, apiSubscriptionP, qTree, geoCoordinatesP, contextP, tenant, showChangesP, sysAttrsP, renderFormat);
+
+  return cSubP;
 }
 
 
@@ -491,12 +492,12 @@ CachedSubscription* subCacheApiSubscriptionInsert
   if (subIdNodeP == NULL)
   {
     kjTreeLog(apiSubscriptionP, "apiSubscriptionP", LmtSubCacheSync);
-    LM_X(1, ("Subscription without id - exiting dur to bug"));
+    LM_X(1, ("Subscription without id - exiting due to bug"));
   }
 
-  char* subId = subIdNodeP->value.s;
+  char*               subId = subIdNodeP->value.s;
+  CachedSubscription* subP  = subCacheItemLookup(tenant, subId);
 
-  CachedSubscription* subP = subCacheItemLookup(tenant, subId);
   if (subP == NULL)
     return subCacheApiSubscriptionCreate(apiSubscriptionP, qTree, geoCoordinatesP, contextP, tenant, showChangesP, sysAttrsP, renderFormat);