fix call count race condition #151

jambonz · Nov 12, 2024 · f054167 · f054167
1 parent c22104f
commit f054167
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/lib/call-session.js b/lib/call-session.js
@@ -677,12 +677,16 @@ class CallSession extends Emitter {
 
         if (process.env.JAMBONES_HOSTING || trackingOn) {
           const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          await nudgeCallCounts(this.logger, {
-            service_provider_sid: this.service_provider_sid,
-            account_sid: this.account_sid,
-            application_sid: this.application_sid
-          }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-            .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+          if (!this.req.locals.callCountNudged) {
+            this.req.locals.callCountNudged = true;
+            this.logger.debug('decrementing call count at end of call');
+            await nudgeCallCounts(this.logger, {
+              service_provider_sid: this.service_provider_sid,
+              account_sid: this.account_sid,
+              application_sid: this.application_sid
+            }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
+              .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+          }
         }
 
         /* write cdr for connected call */

diff --git a/lib/middleware.js b/lib/middleware.js
@@ -106,7 +106,9 @@ module.exports = (srf, logger, redisClient) => {
     try {
       /* decrement count if INVITE is later rejected */
       res.once('end', async({status}) => {
-        if (status > 200) {
+        if (status > 200 && !req.locals.callCountNudged) {
+          req.locals.callCountNudged = true;
+          this.logger.debug('decrementing call count due to call rejection');
           nudgeCallCounts(logger, {
             service_provider_sid,
             account_sid,

diff --git a/test/docker-compose-testbed.yaml b/test/docker-compose-testbed.yaml
@@ -24,7 +24,7 @@ services:
         ipv4_address: 172.39.0.2
 
   sbc:
-    image: drachtio/drachtio-server:latest
+    image: drachtio/drachtio-server:0.8.26
     command: drachtio --contact "sip:*;transport=udp" --loglevel debug --sofia-loglevel 9
     ports:
       - "9060:9022/tcp"