Improve logging

hintjen · Mar 12, 2024 · e5af022 · e5af022
1 parent ec9ba33
commit e5af022
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/fractal_database_matrix/migrations/0001_initial.py b/fractal_database_matrix/migrations/0001_initial.py
@@ -1,6 +1,7 @@
-# Generated by Django 5.0.2 on 2024-03-07 22:55
+# Generated by Django 5.0.3 on 2024-03-12 21:29
 
 import django.db.models.deletion
+import uuid
 from django.db import migrations, models
 
 
@@ -16,7 +17,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MatrixCredentials',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('date_modified', models.DateTimeField(auto_now=True)),
                 ('deleted', models.BooleanField(default=False)),
@@ -43,7 +44,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MatrixReplicationTarget',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('date_modified', models.DateTimeField(auto_now=True)),
                 ('deleted', models.BooleanField(default=False)),

diff --git a/fractal_database_matrix/models.py b/fractal_database_matrix/models.py
@@ -48,7 +48,11 @@ def get_creds(self) -> Union[MatrixCredentials, InMemoryMatrixCredentials]:
         current_db = Database.current_db()
         current_device = Device.current_device()
         if current_db.is_root:
-            return self.matrixcredentials_set.get(device=current_device)
+            try:
+                return self.matrixcredentials_set.get(device=current_device)
+            except MatrixCredentials.DoesNotExist as err:
+                raise Exception(f"Matrix credentials not found for {self}: {err}")
+
         else:
             try:
                 return InMemoryMatrixCredentials(
@@ -80,7 +84,8 @@ async def push_replication_log(self, fixture: List[Dict[str, Any]]) -> None:
 
         room_id = self.metadata["room_id"]
         logger.info(
-            "Target %s is pushing fixture(s): %s to room %s" % (self, replication_event, room_id)
+            "Target %s is pushing fixture(s): %s to room %s on homeserver %s"
+            % (self, replication_event, room_id, self.homeserver)
         )
         creds = await self.aget_creds()
         broker = MatrixBroker().with_matrix_config(