each send is considered a transaction

CHANGES_NEXT_RELEASE

@@ -1 +1,2 @@
 - Add: support for MongoDB replica sets (using the new -rplSet CLI parameter) (Issue #493)
+- Fix: each send is now considered a separate transaction (Issue #478)

src/lib/logMsg/logMsg.h

@@ -38,6 +38,8 @@
 #include <time.h>
 #include <stdint.h>             /* int64, ...                                */
 
+#include "common/globals.h"     /* transactionIdSet                          */
+
 
 
 /******************************************************************************
@@ -1747,11 +1749,11 @@ do                                                        \
 *
 * LM_TRANSACTION_START -
 */
-#define LM_TRANSACTION_START(ip, port, path)                    \
-do                                                              \
-{                                                               \
-  transactionIdSet();                                           \
-  LM_I(("Starting transaction from %s:%d%s", ip, port, path));  \
+#define LM_TRANSACTION_START(keyword, ip, port, path)                  \
+do                                                                     \
+{                                                                      \
+  transactionIdSet();                                                  \
+  LM_I(("Starting transaction %s %s:%d%s", keyword, ip, port, path));  \
 } while (0)
 
 

src/lib/ngsiNotify/onTimeIntervalThread.cpp

@@ -60,13 +60,14 @@ static void doNotification(OnIntervalThreadParams* params, const std::string& te
     int current = getCurrentTime();
 
     /* Send notification (only if subscription is not expired and there is actual data)*/
-    if (current < csi.expiration) {
-
+    if (current < csi.expiration)
+    {
         /* Throttling check (only if throttling is used and at least one notification has been sent) */
-        if (csi.throttling < 0 || csi.lastNotification < 0 || csi.lastNotification + csi.throttling <  current) {
-
+        if (csi.throttling < 0 || csi.lastNotification < 0 || csi.lastNotification + csi.throttling <  current)
+        {
             /* Query database for data */
             NotifyContextRequest ncr;
+
             // FIXME P7: mongoGetContextElementResponses ALWAYS returns SccOk !!!
             if (mongoGetContextElementResponses(csi.entityIdVector, csi.attributeList, &(ncr.contextElementResponseVector), &err, tenant) != SccOk)
             {
@@ -78,9 +79,6 @@ static void doNotification(OnIntervalThreadParams* params, const std::string& te
 
             if (ncr.contextElementResponseVector.size() > 0)
             {
-                // New transactionId for each notification
-                LM_TRANSACTION_START_URL(csi.url.c_str());  // OnTimeInterval Notification Starts
-
                 /* Complete NotifyContextRequest */
                 // FIXME: implement a proper originator string
                 ncr.originator.set("localhost");
@@ -95,16 +93,15 @@ static void doNotification(OnIntervalThreadParams* params, const std::string& te
 
                 ncr.contextElementResponseVector.release();
                 csi.release();
-
-                LM_TRANSACTION_END();   // OnTimeInterval Notification ends here
             }
             else
             {
-                LM_T(LmtNotifier, ("notification not sent due to empty context elements response vector)"));
+              LM_T(LmtNotifier, ("notification not sent due to empty context elements response vector)"));
             }
         }
-        else {
-            LM_T(LmtNotifier, ("notification not sent due to throttling (current time: %d)", current));
+        else
+        {
+          LM_T(LmtNotifier, ("notification not sent due to throttling (current time: %d)", current));
         }
     }
 

src/lib/rest/clientSocketHttp.cpp

@@ -148,46 +148,55 @@ std::string sendHttpSocket
 
   ++callNo;
 
+  LM_TRANSACTION_START("to", ip.c_str(), port, resource.c_str());
+
   // Preconditions check
   if (port == 0)
   {
     LM_E(("Runtime Error (port is ZERO)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if (ip.empty())
   {
     LM_E(("Runtime Error (ip is empty)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if (verb.empty())
   {
     LM_E(("Runtime Error (verb is empty)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if (resource.empty())
   {
     LM_E(("Runtime Error (resource is empty)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if ((content_type.empty()) && (!content.empty()))
   {
     LM_E(("Runtime Error (Content-Type is empty but there is actual content)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if ((!content_type.empty()) && (content.empty()))
   {
     LM_E(("Runtime Error (Content-Type non-empty but there is no content)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
   if ((curl = curl_easy_init()) == NULL)
   {
     LM_E(("Runtime Error (could not init libcurl)"));
+    LM_TRANSACTION_END();
     return "error";
   }
 
@@ -298,6 +307,7 @@ std::string sendHttpSocket
     free(httpResponse->memory);
     delete httpResponse;
 
+    LM_TRANSACTION_END();
     return "error";
   }
 
@@ -334,7 +344,7 @@ std::string sendHttpSocket
   else
   {
     // The Response is here
-    LM_I(("Notification Successfully Sent"));
+    LM_I(("Notification Successfully Sent to %s", url.c_str()));
     result.assign(httpResponse->memory, httpResponse->size);
   }
 
@@ -345,6 +355,7 @@ std::string sendHttpSocket
   free(httpResponse->memory);
   delete httpResponse;
 
+  LM_TRANSACTION_END();
   return result;
 }
 
@@ -361,6 +372,8 @@ int socketHttpConnect(const std::string& host, unsigned short port)
   struct addrinfo*    peer;
   char                port_str[10];
 
+  LM_TRANSACTION_START("to", ip.c_str(), port, resource.c_str());
+
   memset(&hints, 0, sizeof(struct addrinfo));
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = 0;
@@ -386,12 +399,14 @@ int socketHttpConnect(const std::string& host, unsigned short port)
   if (getaddrinfo(host.c_str(), port_str, &hints, &peer) != 0)
   {
     LM_W(("Notification failure for %s:%d (getaddrinfo: %s)", host.c_str(), port, strerror(errno)));
+    LM_TRANSACTION_END();
     return -1;
   }
 
   if ((fd = socket(peer->ai_family, peer->ai_socktype, peer->ai_protocol)) == -1)
   {
     LM_W(("Notification failure for %s:%d (socket: %s)", host.c_str(), port, strerror(errno)));
+    LM_TRANSACTION_END();
     return -1;
   }
 
@@ -400,10 +415,12 @@ int socketHttpConnect(const std::string& host, unsigned short port)
     freeaddrinfo(peer);
     close(fd);
     LM_W(("Notification failure for %s:%d (connect: %s)", host.c_str(), port, strerror(errno)));
+    LM_TRANSACTION_END();
     return -1;
   }
 
   freeaddrinfo(peer);
+  LM_TRANSACTION_END();
   return fd;
 }
 
@@ -641,7 +658,7 @@ std::string sendHttpSocket
       else
       {
           memcpy(response, buffer, nb);
-          LM_I(("Notification Successfully Sent"));
+          LM_I(("Notification Successfully Sent to %s:%d%s", ip.c_str(), port, resource.c_str()));
           LM_T(LmtClientInputPayload, ("Received from HTTP server:\n%s", response));
       }
 
@@ -651,7 +668,7 @@ std::string sendHttpSocket
   else
   {
      LM_T(LmtClientInputPayload, ("not waiting for response"));
-     LM_I(("Notification Successfully Sent"));
+     LM_I(("Notification Successfully Sent to %s:%d%s", ip.c_str(), port, resource.c_str()));
      result = "";
   }
 

src/lib/rest/rest.cpp

@@ -626,7 +626,7 @@ static int connectionTreat
     //
     // Transaction starts here
     //
-    LM_TRANSACTION_START(ip, port, url);  // Incoming REST request starts
+    LM_TRANSACTION_START("from", ip, port, url);  // Incoming REST request starts
 
 
 

test/functionalTest/cases/subscription_sequence_ontimeinterval.test

@@ -80,7 +80,7 @@ payload='<?xml version="1.0"?>
 orionCurl --url "$url" --payload "$payload"
 SUB_ID=$(echo "$_response" | grep subscriptionId | awk -F '>' '{print $2}' | awk -F '<' '{print $1}' | grep -v '^$' )
 
-# Interval from 0 to 5: we recieve some three notifications (t=0, t=2, t=4)
+# Interval from 0 to 5: we receive some three notifications (t=0, t=2, t=4)
 sleep 5
 
 echo "2: ++++++++++++++++++++"
@@ -100,7 +100,7 @@ payload='<?xml version="1.0"?>
 </updateContextSubscriptionRequest>'
 orionCurl --url "$url" --payload "$payload"
 
-#Interval from 5 to 14: we will recieve three notifications (t=5, t=9, t=13)
+# Interval from 5 to 14: we will receive three notifications (t=5, t=9, t=13)
 sleep 9
 
 echo "3: ++++++++++++++++++++"
@@ -370,6 +370,3 @@ TIMES: REGEX((0, 2, 4, 5, 9, 13, 14, 24, 34, 35, 37, 39, 53, 65, 67, 69|0, 2, 4,
 --TEARDOWN--
 brokerStop CB
 accumulatorStop
-
-mv /tmp/contextBroker.log /tmp/contextBroker.log.oti
-