refactoring

[photosort.git] / src / photosort-daemon.py

diff --git a/src/photosort-daemon.py b/src/photosort-daemon.py
index 9bb7213dc66dfd395dc9c0ccae1c51f4b6976ff0..e345b837188b3fe5fed584630753c530a3a8bc59 100755 (executable)
--- a/src/photosort-daemon.py
+++ b/src/photosort-daemon.py
@@ -5,6 +5,7 @@ import json
 import logging
 import os
 import signal
+import sys
 import time
 
 from bunch import Bunch
@@ -30,19 +31,28 @@ logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
                     level=logging.getLevelName(args.log_lvl),
                     datefmt='%m/%d/%Y %H:%M:%S')
 
+status = 0
+
 with open(args.config_file) as f:
     cfg = json.load(f)
 
+bunch_idx = 1
 bunches = []
 for bunch_cfg in cfg['bunches']:
-    bunches.append( Bunch(bunch_cfg) )
-
+    bunches.append( Bunch(bunch_idx, bunch_cfg) )
+    bunch_idx += 1
 
 for bunch in bunches:
     bunch.start()
 
 while not stop:
+    for bunch in bunches:
+        if not bunch.is_running():
+            stop = True
+            status = 1
     time.sleep(2.0)
 
 for bunch in bunches:
     bunch.stop()
+
+sys.exit(status)