fix: use docker-compose.override.yml

pyronear · May 22, 2024 · 94372bc · 94372bc
1 parent 488de0a
commit 94372bc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -119,4 +119,5 @@ pyroengine/version.py
 # Release
 conda-dist/
 
-docker-compose.yml.bak
+docker-compose.yml.bak
+docker-compose.override.yml
diff --git a/Makefile b/Makefile
@@ -26,9 +26,10 @@ build:
 
 # Run the engine wrapper
 run:
-	bash setup-docker-compose.sh
+	bash scripts/setup-docker-compose.sh
 	docker build . -t pyronear/pyro-engine:latest
 	docker compose up -d
+	rm docker-compose.yml.bak
 
 # Get log from engine wrapper
 log: 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       resources:
         limits:
           cpus: "3"
-          memory:
+          memory: ""
     logging:
       driver: "json-file"
       options:

diff --git a/promtail/config.yml b/promtail/config.yml
diff --git a/pyroengine/core.py b/pyroengine/core.py
@@ -42,8 +42,9 @@ def analyze_stream(self, idx: int) -> None:
             img = self.cameras[idx].capture()
             try:
                 self.engine.predict(img, self.cameras[idx].ip_address)
-            except Exception:
+            except Exception as e: 
                 logging.warning(f"Unable to analyze stream from camera {self.cameras[idx]}")
+                logging.warning(e)
         except Exception:
             logging.warning(f"Unable to fetch stream from camera {self.cameras[idx]}")
 

diff --git a/setup-docker-compose.sh → scripts/setup-docker-compose.sh b/setup-docker-compose.sh → scripts/setup-docker-compose.sh
@@ -28,6 +28,6 @@ in_limits && /memory:/ {
     $0 = gensub(/memory:.*/, "memory: " mem_limit, 1)
 }
 { print }
-' "${DOCKER_COMPOSE_FILE}.bak" > $DOCKER_COMPOSE_FILE
+' "${DOCKER_COMPOSE_FILE}.bak" > "docker-compose.override.yml"
 
 echo "Memory limits set to $LIMIT_MEM_MB in $DOCKER_COMPOSE_FILE"