1 files changed, 40 insertions, 8 deletions
diff --git a/sheepdog/worker.py b/sheepdog/worker.py
index 4e3610e..cf28b74 100644
--- a/sheepdog/worker.py
+++ b/sheepdog/worker.py
@@ -5,9 +5,36 @@ import time
 import redis
 import redis.connection
 
-# Enable importing from one dir up since gn3 isn't installed as a globally
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+# Enable importing from one dir up: put as first to override any other globally
+# accessible GN3
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
+def update_status(conn, cmd_id, status):
+    """Helper to update command status"""
+    conn.hset(name=f"{cmd_id}", key="status", value=f"{status}")
+
+def make_incremental_backoff(init_val: float=0.1, maximum: int=420):
+    """
+    Returns a closure that can be used to increment the returned value up to
+    `maximum` or reset it to `init_val`.
+    """
+    current = init_val
+
+    def __increment_or_reset__(command: str, value: float=0.1):
+        nonlocal current
+        if command == "reset":
+            current = init_val
+            return current
+
+        if command == "increment":
+            current = current + abs(value)
+            if current > maximum:
+                current = maximum
+            return current
+
+        return current
+
+    return __increment_or_reset__
 
 def run_jobs(conn):
     """Process the redis using a redis connection, CONN"""
@@ -17,16 +44,21 @@ def run_jobs(conn):
     if bool(cmd_id):
         cmd = conn.hget(name=cmd_id, key="cmd")
         if cmd and (conn.hget(cmd_id, "status") == b"queued"):
-            result = run_cmd(cmd.decode("utf-8"))
+            update_status(conn, cmd_id, "running")
+            result = run_cmd(
+                cmd.decode("utf-8"), env=conn.hget(name=cmd_id, key="env"))
             conn.hset(name=cmd_id, key="result", value=result.get("output"))
             if result.get("code") == 0:  # Success
-                conn.hset(name=cmd_id, key="status", value="success")
+                update_status(conn, cmd_id, "success")
             else:
-                conn.hset(name=cmd_id, key="status", value="error")
-
+                update_status(conn, cmd_id, "error")
+        return cmd_id
 
 if __name__ == "__main__":
     redis_conn = redis.Redis()
+    sleep_time = make_incremental_backoff()
     while True:  # Daemon that keeps running forever:
-        run_jobs(redis_conn)
-        time.sleep(0.1)
+        if run_jobs(redis_conn):
+            time.sleep(sleep_time("reset"))
+            continue
+        time.sleep(sleep_time("increment", sleep_time("return_current")))