BUGFIX:

- Sneaker: created empty sneaker.json if server was still unregistered
- Logfiles were not written anymore after an DCS dump.

Author: karel26

core/data/impl/nodeimpl.py

@@ -29,7 +29,7 @@
 from packaging.version import parse
 from pathlib import Path
 from psycopg import sql
-from psycopg.errors import UndefinedTable, InFailedSqlTransaction, ConnectionTimeout
+from psycopg.errors import UndefinedTable, InFailedSqlTransaction, ConnectionTimeout, UniqueViolation
 from psycopg.types.json import Json
 from psycopg_pool import ConnectionPool, AsyncConnectionPool
 from typing import Optional, Union, Awaitable, Callable, Any, cast
@@ -350,8 +350,12 @@ async def init_instances(self):
                 """, (self.name,))
         # initialize the nodes
         for _name, _element in self.locals.pop('instances', {}).items():
-            instance = DataObjectFactory().new(InstanceImpl, node=self, name=_name, locals=_element)
-            self.instances.append(instance)
+            try:
+                instance = DataObjectFactory().new(InstanceImpl, node=self, name=_name, locals=_element)
+                self.instances.append(instance)
+            except UniqueViolation:
+                self.log.error(f"Instance \"{_name}\" can't be added."
+                               f"There is an instance already with the same server name or bot port.")
 
     async def update_db(self):
         # Initialize the cluster tables ...

core/utils/validators.py

@@ -104,7 +104,11 @@ def file_exists(value, _, path):
     return True
 
 def unique_port(value, _, path):
-    if not isinstance(value, int) or value < 1024 or value > 65535:
+    try:
+        value = int(value)
+        if value < 1024 or value > 65535:
+            raise ValueError
+    except ValueError:
         raise SchemaError(msg=f"{value} is not a valid port", path=path)
     node = path.split("/")[1]
     if node not in ports:

extensions/sneaker/extension.py

@@ -74,7 +74,7 @@ def create_config(self):
         cfg['servers'] = [
             x for x in cfg['servers'] if x['name'] in [
                 y.name for y in self.bus.servers.values()
-                if y.status not in [Status.UNREGISTERED, Status.SHUTDOWN]
+                if y.name == self.server.name or y.status not in [Status.UNREGISTERED, Status.SHUTDOWN]
             ]
         ]
         with open(filename, mode='w', encoding='utf-8') as file:

services/monitoring/service.py

@@ -163,12 +163,16 @@ async def kill_hung_server(self, server: Server):
                 try:
                     filename = os.path.join(server.instance.home, 'Logs',
                                             f"{now.strftime('dcs-%Y%m%d-%H%M%S')}.dmp")
+
+                    # Save all handlers before create_dump
+                    root = logging.getLogger()
+                    saved_handlers = root.handlers[:]
+
                     await asyncio.to_thread(create_dump, server.process.pid, filename,
                                             MINIDUMP_TYPE.MiniDumpNormal, True)
 
-                    root = logging.getLogger()
-                    if root.handlers:
-                        root.removeHandler(root.handlers[0])
+                    # Restore the original loggers
+                    root.handlers = saved_handlers
                 except OSError:
                     self.log.debug("No minidump created due to an error (Linux?).")
             shutil.copy2(os.path.join(server.instance.home, 'Logs', 'dcs.log'),