contexts isActive error on null

aws · Feb 7, 2025 · 5738ab8 · 5738ab8
1 parent 5aa815c
commit 5738ab8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/common/lib/plugins/efm2/monitor.ts b/common/lib/plugins/efm2/monitor.ts
@@ -175,12 +175,12 @@ export class MonitorImpl implements Monitor {
 
           let monitorContextRef: WeakRef<MonitorConnectionContext> | undefined;
 
-          while ((monitorContextRef = this.activeContexts.shift()) != null) {
+          while ((monitorContextRef = this.activeContexts.shift())) {
             if (this.isStopped()) {
               break;
             }
-            const monitorContext = monitorContextRef.deref();
-            if (monitorContext == null) {
+            const monitorContext: MonitorConnectionContext = monitorContextRef?.deref() ?? null;
+            if (!monitorContext) {
               continue;
             }
 
@@ -193,15 +193,15 @@ export class MonitorImpl implements Monitor {
                 await this.endMonitoringClient();
                 this.abortedConnectionsCounter.inc();
               }
-            } else if (monitorContext.isActive()) {
+            } else if (monitorContext && monitorContext.isActive()) {
               tmpActiveContexts.push(monitorContextRef);
             }
 
             // activeContexts is empty now and tmpActiveContexts contains all yet active contexts
             // Add active contexts back to the queue.
             this.activeContexts.push(...tmpActiveContexts);
 
-            const delayMillis = this.failureDetectionIntervalNanos - (statusCheckEndTimeNanos - statusCheckStartTimeNanos) / 1000000;
+            const delayMillis = (this.failureDetectionIntervalNanos - (statusCheckEndTimeNanos - statusCheckStartTimeNanos)) / 1000000;
 
             await new Promise((resolve) => {
               this.delayMillisTimeoutId = setTimeout(
@@ -211,11 +211,11 @@ export class MonitorImpl implements Monitor {
             });
           }
         } catch (error: any) {
-          logger.debug(Messages.get("MonitorImpl.exceptionDuringMonitoringContinue", error.message));
+          logger.debug(Messages.get("MonitorImpl.errorDuringMonitoringContinue", error.message));
         }
       }
     } catch (error: any) {
-      logger.debug(Messages.get("MonitorImpl.exceptionDuringMonitoringStop", error.message));
+      logger.debug(Messages.get("MonitorImpl.errorDuringMonitoringStop", error.message));
     } finally {
       await this.endMonitoringClient();
       await sleep(3000);
@@ -245,7 +245,7 @@ export class MonitorImpl implements Monitor {
         }
 
         logger.debug(`Opening a monitoring connection to ${this.hostInfo.url}`);
-        this.monitoringClient = await this.pluginService.forceConnect(this.hostInfo, this.properties);
+        this.monitoringClient = await this.pluginService.forceConnect(this.hostInfo, monitoringConnProperties);
         logger.debug(`Successfully opened monitoring connection to ${this.monitoringClient.id} - ${this.hostInfo.url}`);
         return true;
       }

diff --git a/common/lib/plugins/efm2/monitor_connection_context.ts b/common/lib/plugins/efm2/monitor_connection_context.ts
@@ -52,6 +52,7 @@ export class MonitorConnectionContext {
   }
 
   isActive() {
-    return this.clientToAbortRef.deref() !== null;
+    const val = this.clientToAbortRef?.deref() ?? null;
+    return val !== null;
   }
 }
diff --git a/common/lib/utils/locales/en.json b/common/lib/utils/locales/en.json
@@ -230,6 +230,5 @@
   "HostMonitor.detectedWriter": "Detected writer: '%s'.",
   "HostMonitor.endMonitoring": "Host monitor '%s' completed in '%s'.",
   "HostMonitor.writerHostChanged": "Writer host has changed from '%s' to '%s'.",
-  "HostMonitoringConnectionPlugin.monitoringDeactivated": "Monitoring deactivated for method '%s'.",
-  "MonitorImpl.exceptionDuringMonitoringContinue": "MonitorImpl.exceptionDuringMonitoringContinue"
+  "HostMonitoringConnectionPlugin.monitoringDeactivated": "Monitoring deactivated for method '%s'."
 }