Merge pull request #803 from prey/fix/triggers-when-non-persisting-ac…

…tion Fix non persisting action triggers and same type action is already executed
prey · Jul 24, 2023 · aaa1786 · aaa1786
2 parents d0c4509 + 4a9adc2
commit aaa1786
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/agent/actions/triggers/index.js b/lib/agent/actions/triggers/index.js
@@ -155,7 +155,7 @@ function run_action(trigger, action) {
 
   setTimeout(() => {
     if (action.action.options) action.action.options.trigger_id = trigger.id;
-    commands.perform(action.action);
+    commands.perform(action.action, trigger.persist);
   }, timeout);
 }
 

diff --git a/lib/agent/commands.js b/lib/agent/commands.js
@@ -103,7 +103,7 @@ exports.parse = function (body) {
   return c;
 };
 
-exports.perform = function (command) {
+exports.perform = function (command, persist = 1) {
   if (!command) return handle_error(new Error('No command received'));
 
   if (typeof command.options == 'string') {
@@ -212,7 +212,7 @@ exports.perform = function (command) {
         }
       });
     }
-    update_stored(type, id, command.target, command.options);
+    if (persist) update_stored(type, id, command.target, command.options);
   } else {
     handle_error(
       new Error('Unknown command: ' + (command.command || command.name))