fix for schedule with duration

newrelic · Oct 8, 2024 · b615f14 · b615f14
1 parent c4c2e4d
commit b615f14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/nr-security-agent/index.js b/lib/nr-security-agent/index.js
@@ -134,7 +134,7 @@ function initialize() {
 
  if (delay > 0) {
  logger.debug("IAST delay is set to:", delay);
- logger.info("Security Agent scan time is set to:", commonUtils.getScheduledScanTime(delay))
+ logger.info("Security Agent delay scan time is set to:", commonUtils.getScheduledScanTime(delay))
  Agent.getAgent().delayed = true;
  setTimeout(() => {
  Agent.getAgent().delayed = false;

diff --git a/lib/nr-security-agent/lib/core/commonUtils.js b/lib/nr-security-agent/lib/core/commonUtils.js
@@ -451,9 +451,13 @@ function listSkipDetectionCategory() {
 
 function refreshAgent() {
  const { Agent } = require('./agent');
- const wsClient = Agent.getAgent().client;
- Agent.getAgent().status.setStatus('connecting');
- wsClient.obeyReconnect();
+ if (Agent.getAgent().status.getStatus() == 'disabled' || Agent.getAgent().delayed) {
+ Agent.getAgent().delayed = false;
+ const wsClient = Agent.getAgent().client;
+ Agent.getAgent().status.setStatus('connecting');
+ wsClient.obeyReconnect();
+ honourDurationConfiguration();
+ }
 }
 
 function executeCronSchedule() {
@@ -553,7 +557,7 @@ function honourCronExpression() {
  schedule = schedule.replace(/\?/g, '*');
  honourCronFlag = true;
  Agent.getAgent().delayed = true;
- logger.info("Security Agent scan time is set to:", getScheduledScanTime(Math.ceil(cron.timeout(schedule) / 60000)))
+ logger.info("Security Agent scheduled time is set to:", getScheduledScanTime(Math.floor(cron.timeout(schedule) / 60000)))
  setTimeout(() => {
  Agent.getAgent().delayed = false;
  if (!NRAgent.config.security.scan_schedule.always_sample_traces) {

diff --git a/lib/nr-security-agent/lib/core/connections/websocket/response/fuzz-request-handler.js b/lib/nr-security-agent/lib/core/connections/websocket/response/fuzz-request-handler.js
@@ -47,7 +47,7 @@ function startIASTSchedular() {
  if (isNaN(delay) || delay < 0) {
  delay = 0;
  }
- logger.debug("IAST data pull request is scheduled at %s", require('../../../commonUtils').getScheduledScanTime(delay))
+ // logger.debug("IAST data pull request is scheduled at %s", require('../../../commonUtils').getScheduledScanTime(delay))
  }
  if (!Agent.getAgent().delayed) {
  Agent.getAgent().client.dispatcher(IASTUtil.generateIASTDataRequest());