Merge branch 'dev' into dist

massimocandela · massimocandela · commit 11b09f97e47a · 2024-02-12T13:32:26.000+01:00
diff --git a/src/monitors/monitorROAS.js b/src/monitors/monitorROAS.js
@@ -60,9 +60,10 @@ export default class MonitorROAS extends Monitor {
 
     _enablePeriodicCheck = (condition, checkFunction, seconds) => {
         if (condition) {
-            setInterval(() => {
-                this._skipIfStaleVrps(checkFunction);
-            }, global.EXTERNAL_ROA_EXPIRATION_TEST || seconds * 1000);
+            if (!global.EXTERNAL_ROA_EXPIRATION_TEST) {
+                setTimeout(() => this._skipIfStaleVrps(checkFunction), 30 * 1000); // Initial run
+            }
+            setInterval(() => this._skipIfStaleVrps(checkFunction), global.EXTERNAL_ROA_EXPIRATION_TEST || seconds * 1000); // Periodic run
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,10 @@ export default class MonitorROAS extends Monitor {`
`60`	`60`
`61`	`61`	`_enablePeriodicCheck = (condition, checkFunction, seconds) => {`
`62`	`62`	`if (condition) {`
`63`		`- setInterval(() => {`
`64`		`- this._skipIfStaleVrps(checkFunction);`
`65`		`- }, global.EXTERNAL_ROA_EXPIRATION_TEST \|\| seconds * 1000);`
	`63`	`+ if (!global.EXTERNAL_ROA_EXPIRATION_TEST) {`
	`64`	`+ setTimeout(() => this._skipIfStaleVrps(checkFunction), 30 * 1000); // Initial run`
	`65`	`+ }`
	`66`	`+ setInterval(() => this._skipIfStaleVrps(checkFunction), global.EXTERNAL_ROA_EXPIRATION_TEST \|\| seconds * 1000); // Periodic run`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`