Improve performance

Author: quietsy

root/app/swag-ondemand.py

@@ -11,77 +11,71 @@
 
 last_accessed_urls = set()
 last_accessed_urls_lock = threading.Lock()
-ondemand_containers = {}
-ondemand_containers_lock = threading.Lock()
 
 class ContainerThread(threading.Thread):
     def __init__(self):
         super().__init__()
         self.daemon = True
+        self.ondemand_containers = {}
         try:
             self.docker_client = docker.from_env()
         except Exception as e:
             logging.exception(e)
 
     def process_containers(self):
-        global ondemand_containers
         containers = self.docker_client.containers.list(all=True, filters={ "label": ["swag_ondemand=enable"] })
         container_names = {container.name for container in containers}
 
-        for container_name in list(ondemand_containers.keys()):
+        for container_name in list(self.ondemand_containers.keys()):
             if container_name in container_names:
                 continue
-            ondemand_containers.pop(container_name)
+            self.ondemand_containers.pop(container_name)
             logging.info(f"Stopped monitoring {container_name}")
 
         for container in containers:
             container_urls = container.labels.get("swag_ondemand_urls", f"https://{container.name}.,http://{container.name}.")
-            if container.name not in ondemand_containers.keys():
+            if container.name not in self.ondemand_containers.keys():
                 last_accessed = datetime.now()
                 logging.info(f"Started monitoring {container.name}")
             else:
-                last_accessed = ondemand_containers[container.name]["last_accessed"]
-            ondemand_containers[container.name] = { "status": container.status, "urls": container_urls, "last_accessed": last_accessed }
+                last_accessed = self.ondemand_containers[container.name]["last_accessed"]
+            self.ondemand_containers[container.name] = { "status": container.status, "urls": container_urls, "last_accessed": last_accessed }
 
     def stop_containers(self):
-        global ondemand_containers
-        
-        for container_name in ondemand_containers.keys():
-            if ondemand_containers[container_name]["status"] != "running":
+        for container_name in self.ondemand_containers.keys():
+            if self.ondemand_containers[container_name]["status"] != "running":
                 continue
-            inactive_seconds = (datetime.now() - ondemand_containers[container_name]["last_accessed"]).total_seconds()
+            inactive_seconds = (datetime.now() - self.ondemand_containers[container_name]["last_accessed"]).total_seconds()
             if inactive_seconds < STOP_THRESHOLD:
                 continue
             self.docker_client.containers.get(container_name).stop()
             logging.info(f"Stopped {container_name} after {STOP_THRESHOLD}s of inactivity")
 
     def start_containers(self):
-        global ondemand_containers
         with last_accessed_urls_lock:
             last_accessed_urls_combined = ",".join(last_accessed_urls)
             last_accessed_urls.clear()
 
-        for container_name in ondemand_containers.keys():
+        for container_name in self.ondemand_containers.keys():
             accessed = False
-            for ondemand_url in ondemand_containers[container_name]["urls"].split(","):
+            for ondemand_url in self.ondemand_containers[container_name]["urls"].split(","):
                 if ondemand_url not in last_accessed_urls_combined:
                     continue
-                ondemand_containers[container_name]["last_accessed"] = datetime.now()
+                self.ondemand_containers[container_name]["last_accessed"] = datetime.now()
                 accessed = True
-            if not accessed or ondemand_containers[container_name]["status"] == "running":
+            if not accessed or self.ondemand_containers[container_name]["status"] == "running":
                 continue
             self.docker_client.containers.get(container_name).start()
             logging.info(f"Started {container_name}")
-            ondemand_containers[container_name]["status"] = "running"
+            self.ondemand_containers[container_name]["status"] = "running"
 
     def run(self):
         while True:
             try:
-                with ondemand_containers_lock:
-                    self.process_containers()
-                    self.start_containers()
-                    self.stop_containers()
-                time.sleep(2)
+                self.process_containers()
+                self.start_containers()
+                self.stop_containers()
+                time.sleep(5)
             except Exception as e:
                 logging.exception(e)