Merge pull request Uninett#2640 from lunkwill42/feature/ipdevpoll-log…

…ging

Improve ipdevpoll logging of SQL queries and from Twisted library

python/nav/ipdevpoll/daemon.py

@@ -30,6 +30,7 @@
 import time
 import argparse
 
+import twisted
 from twisted.internet import reactor
 from twisted.internet.defer import maybeDeferred, setDebugging
 from twisted.python.failure import Failure
@@ -412,6 +413,9 @@ def run(self):
 
     def init_logging(self, stderr_only=False):
         """Initializes ipdevpoll logging for the current process."""
+        observer = twisted.python.log.PythonLoggingObserver()
+        observer.start()
+
         formatter = ContextFormatter(self.options.pidlog)
 
         logfile_name = None

python/nav/ipdevpoll/db.py

@@ -29,6 +29,7 @@
 from psycopg2 import InterfaceError, OperationalError
 
 _logger = logging.getLogger(__name__)
+_query_logger = logging.getLogger(".".join((__name__, "query")))
 
 
 class ResetDBConnectionError(Exception):
@@ -51,7 +52,7 @@ def django_debug_cleanup():
     if query_count:
         runtime = sum_django_queries_runtime()
         thread = threading.current_thread()
-        _logger.debug(
+        _query_logger.debug(
             "Thread %s/%s: Removing %d logged Django queries "
             "(total time %.03f):\n%s",
             thread.ident,
@@ -117,8 +118,9 @@ def _reset(*args, **kwargs):
                 "dropped, resetting it now - you may see further "
                 "errors about this until the situation is fully "
                 "resolved for all threads "
-                "(this thread is '%s', error was '%s')",
+                "(this thread is '%s', function was: %r, error was '%s')",
                 thread.name,
+                func,
                 error,
             )
             django.db.connection.connection = None