Merge branch 'film42-gt/stop_on_elastalert_exit' into develop

Author: martijnrondeel

src/controllers/process/index.js

@@ -9,6 +9,7 @@ export default class ProcessController {
 
   constructor() {
     this._elastalertPath = config.get('elastalertPath');
+    this._onExitCallbacks = [];
     this._status = Status.IDLE;
 
     /**
@@ -18,6 +19,10 @@ export default class ProcessController {
     this._process = null;
   }
 
+  onExit(onExitCallback) {
+    this._onExitCallbacks.push(onExitCallback);
+  }
+
   get status() {
     return this._status;
   }
@@ -112,6 +117,12 @@ export default class ProcessController {
         this._status = Status.ERROR;
       }
       this._process = null;
+
+      this._onExitCallbacks.map(function(onExitCallback) {
+        if (onExitCallback !== null) {
+          onExitCallback();
+        }
+      });
     });
 
     // Set listener for ElastAlert error

src/elastalert_server.js

@@ -69,6 +69,10 @@ export default class ElastalertServer {
         self._fileSystemController = new FileSystem();
         self._processController = new ProcessController();
         self._processController.start();
+        self._processController.onExit(function() {
+          // If the elastalert process exits, we should stop the server.
+          process.exit(0);
+        });
 
         self._rulesController = new RulesController();
         self._templatesController = new TemplatesController();