reduce number of calls to _clientContext.getStore()

bugsnag · Aug 29, 2024 · c06b16b · c06b16b
1 parent fc02f00
commit c06b16b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/node/src/notifier.js b/packages/node/src/notifier.js
@@ -103,8 +103,9 @@ Object.keys(Client.prototype).forEach((m) => {
   Bugsnag[m] = function () {
     // if we are in an async context, use the client from that context
     let client = Bugsnag._client
-    if (client && client._clientContext && client._clientContext.getStore()) {
-      client = client._clientContext.getStore()
+    const ctx = client && client._clientContext && client._clientContext.getStore()
+    if (ctx) {
+      client = ctx
     }
 
     if (!client) return console.error(`Bugsnag.${m}() was called before Bugsnag.start()`)

diff --git a/packages/plugin-node-uncaught-exception/uncaught-exception.js b/packages/plugin-node-uncaught-exception/uncaught-exception.js
@@ -7,7 +7,8 @@ module.exports = {
     if (!client._config.enabledErrorTypes.unhandledExceptions) return
     _handler = err => {
       // if we are in an async context, use the client from that context
-      const c = (client._clientContext && client._clientContext.getStore()) ? client._clientContext.getStore() : client
+      const ctx = client._clientContext && client._clientContext.getStore()
+      const c = ctx || client
 
       // check if the stacktrace has no context, if so append the frames we created earlier
       // see plugin-contextualize for where this is created

diff --git a/packages/plugin-node-unhandled-rejection/unhandled-rejection.js b/packages/plugin-node-unhandled-rejection/unhandled-rejection.js
@@ -4,7 +4,8 @@ module.exports = {
     if (!client._config.autoDetectErrors || !client._config.enabledErrorTypes.unhandledRejections) return
     _handler = err => {
       // if we are in an async context, use the client from that context
-      const c = (client._clientContext && client._clientContext.getStore()) ? client._clientContext.getStore() : client
+      const ctx = client._clientContext && client._clientContext.getStore()
+      const c = ctx || client
 
       const event = c.Event.create(err, false, {
         severity: 'error',