Merge branch 'master' into task/add_more_cases

telefonicaid · Sep 26, 2023 · c8e968c · c8e968c
2 parents 596a1a8 + 41e53ad
commit c8e968c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,8 +1,8 @@
 - Add: apply expandVar with JSON.parse to all fields of all actions (sms, smpp, email, post, update)
+- Fix: check domain before access domain
 - Fix: expandVar return a 'null' instead of null (#746)
 - Fix: smtp and smpp logs (#738)
 - Add: allow access entities using NGSIv2 API for non_signal rules (new setting nonSignalByAPI / PERSEO_CHECK_NON_SIGNAL_BY_API) (#549)
 - Remove support for ngsv1 notifications (#714)
 - Remove ngsiv1 support for updateAction (#714)
-- Fix: check timer string in lower case in TimedRule checker
-
+- Fix: check timer string in lower case in TimedRule checker
diff --git a/lib/myutils.js b/lib/myutils.js
@@ -146,7 +146,7 @@ function requestHelperAux(method, options, withMetrics, callback) {
         }
     }
     options.headers = headers;
-    if (withMetrics && options.json && domain.context) {
+    if (withMetrics && options.json && domain && domain.context) {
         try {
             metrics.IncMetrics(
                 domain.context.srv,
@@ -160,7 +160,7 @@ function requestHelperAux(method, options, withMetrics, callback) {
     }
     request[method](options, function cbRequest2core(err, response, body) {
         var bodySz = 0;
-        if (withMetrics && domain.context) {
+        if (withMetrics && domain && domain.context) {
             if (body) {
                 if (typeof body === 'string') {
                     bodySz = Buffer.byteLength(body);
@@ -181,7 +181,7 @@ function requestHelperAux(method, options, withMetrics, callback) {
         }
         if (err) {
             logErrorIf(err, util.format('error %s to %s', method, options.url));
-            if (withMetrics && domain.context) {
+            if (withMetrics && domain && domain.context) {
                 metrics.IncMetrics(domain.context.srv, domain.context.subsrv, metrics.outgoingTransactionsErrors);
             }
             return callback(err, null);
@@ -199,7 +199,7 @@ function requestHelperAux(method, options, withMetrics, callback) {
             );
             localError.httpCode = respObj.code < 500 && respObj.code >= 400 ? respObj.code : 500;
             logErrorIf(localError, null, domain && domain.context);
-            if (withMetrics && domain.context) {
+            if (withMetrics && domain && domain.context) {
                 metrics.IncMetrics(domain.context.srv, domain.context.subsrv, metrics.outgoingTransactionsErrors);
             }
             return callback(localError, respObj);