move parts to SignalInfoManager model

huey_monitor/models.py

@@ -1,5 +1,8 @@
 import logging
 import uuid
+import os
+import threading
+import socket
 
 from bx_django_utils.models.timetracking import TimetrackingBaseModel
 from django.db import models
@@ -13,13 +16,18 @@
 
 
 try:
-    from functools import cached_property  # new in Python 3.8
+    from functools import lru_cache, cached_property  # new in Python 3.8
 except ImportError:
     from django.utils.functional import cached_property
 
 
 logger = logging.getLogger(__name__)
 
+lru_cache(maxsize=None)
+def get_hostname():
+    return socket.gethostname()
+
+
 
 class TaskManager(models.Manager):
     def set_parent_task(self, main_task_id, sub_task_id):
@@ -255,6 +263,16 @@ class SignalInfoModel(models.Model):
         help_text=_('(will be set automatically)')
     )
 
+    def __init__(self, *args, **kwargs):
+        if not 'hostname' in kwargs:
+            kwargs['hostname'] = get_hostname()
+        if not 'pid' in kwargs:
+            kwargs['pid'] = os.getpid()
+        if not 'thread' in kwargs:
+            kwargs['thread'] = threading.current_thread().name
+
+        super().__init__(*args, **kwargs)
+
     def admin_link(self):
         url = reverse('admin:huey_monitor_signalinfomodel_change', args=[self.pk])
         return url

huey_monitor/tasks.py

@@ -1,11 +1,7 @@
 import logging
-import os
-import socket
 import sys
-import threading
 import traceback
 import uuid
-from functools import lru_cache
 
 from django.db import transaction
 from django.db.models import Sum
@@ -18,9 +14,6 @@
 logger = logging.getLogger(__name__)
 
 
-@lru_cache(maxsize=None)
-def get_hostname():
-    return socket.gethostname()
 
 
 def update_task_instance(instance, last_signal, task_finished):
@@ -58,10 +51,6 @@ def store_signals(signal, task, exc=None):
     logger.info('Store Task %s signal %r (finished: %s)', task_id, signal, task_finished)
 
     signal_kwargs = {
-        # TODO: move parts into huey_monitor.models.SignalInfoManager
-        'hostname': get_hostname(),
-        'pid': os.getpid(),
-        'thread': threading.current_thread().name,
         'signal_name': signal,
     }
 
@@ -111,10 +100,6 @@ def startup_handler():
         for task_model_instance in qs:
             logger.warning('Mark "executing" task %s to "unknown"', task_model_instance.pk)
             last_signal = SignalInfoModel.objects.create(
-                # TODO: move parts into huey_monitor.models.SignalInfoManager
-                hostname=get_hostname(),
-                pid=os.getpid(),
-                thread=threading.current_thread().name,
                 task_id=task_model_instance.pk,
                 signal_name='unknown',
                 progress_count=task_model_instance.progress_count,