assemblyline-core 4.7.2.dev7__tar.gz → 4.7.2.dev10__tar.gz

{assemblyline_core-4.7.2.dev7 → assemblyline_core-4.7.2.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev7
+Version: 4.7.2.dev10
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.dev10/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.2.dev10

{assemblyline_core-4.7.2.dev7 → assemblyline_core-4.7.2.dev10}/assemblyline_core/scaler/controllers/docker_ctl.py

@@ -8,7 +8,6 @@ from collections import defaultdict
 from typing import Dict, List, Optional, Tuple
 
 import docker
-
 from assemblyline.odm.models.service import DependencyConfig, DockerConfig
 
 from .interface import ControllerInterface, ServiceControlError
@@ -87,6 +86,9 @@ class DockerController(ControllerInterface):
         threading.Thread(target=self._refresh_service_networks, daemon=True).start()
         self._flush_containers()  # Clear out any containers that are left over from a previous run
 
+        # Start a background thread to watch for container events for debugging purposes
+        threading.Thread(target=self._container_events, daemon=True).start()
+
         if COMPOSE_PROJECT:
             self._prefix = COMPOSE_PROJECT + "_svc_"
             self._labels["com.docker.compose.project"] = COMPOSE_PROJECT
@@ -100,6 +102,24 @@ class DockerController(ControllerInterface):
                     if label in container.labels:
                         self._labels[label] = container.labels[label]
 
+    def _container_events(self):
+        """General watch of docker events for debugging purposes.
+
+        @contributor: @kam193
+        """
+
+        # Filter for OOM events from our containers, and log them when they happen.
+        oom_filter = {"event": "oom", "type": "container"}
+        if COMPOSE_PROJECT:
+            oom_filter["label"] = f"com.docker.compose.project={COMPOSE_PROJECT}"
+        elif self._labels:
+            oom_filter["label"] = [f"{k}={v}" for k, v in self._labels.items() if v]
+
+        for event in self.client.events(decode=True, filters=oom_filter):
+            self.log.warning(f"Container {event.get('Actor', {}).get('Attributes', {}).get('name', 'unknown')}"
+                             "killed by OOM")
+
+
     def find_service_server(self):
         service_server_container = None
         while service_server_container is None:

{assemblyline_core-4.7.2.dev7 → assemblyline_core-4.7.2.dev10}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.2.dev7
+Version: 4.7.2.dev10
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.2.dev7/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.2.dev7