Merge remote-tracking branch 'remotes/origin/2.4/dev' into dockerips

salt/strelka/filecheck/filecheck

@@ -65,6 +65,8 @@ if __name__ == "__main__":
     event_handler =CreatedEventHandler()
 
     observer = Observer()
+
+    logging.info("Starting filecheck")
     observer.schedule(event_handler, extract_path, recursive=True)
     observer.start()
     try:
@@ -72,4 +74,6 @@ if __name__ == "__main__":
             time.sleep(1)
     except KeyboardInterrupt:
         observer.stop()
-    observer.join()
+    observer.join()
+
+    logging.info("Exiting filecheck")

salt/strelka/init.sls

@@ -135,11 +135,9 @@ filecheck_script:
     - mode: 755
 
 filecheck_run:
-  cmd.run:
-    - name: 'python3 /opt/so/conf/strelka/filecheck'
-    - bg: True
-    - runas: socore
-    - unless: ps -ef | grep filecheck | grep -v grep
+  cron.present:
+    - name: 'ps -ef | grep filecheck | grep -v grep || python3 /opt/so/conf/strelka/filecheck >> /opt/so/log/strelka/filecheck_stdout.log 2>&1 &'
+    - user: socore
 
 filcheck_history_clean:
   cron.present: