Mutualize commands logger configs

Grégoire Deveaux · jelly · commit 5c5a455458eb · 2022-01-09T19:14:55.000+01:00
diff --git a/devel/management/commands/archweb_inotify.py b/devel/management/commands/archweb_inotify.py
@@ -2,19 +2,14 @@
 import multiprocessing
 import os
 import pyinotify
-import sys
 import threading
 import time
 
 from django.db.utils import OperationalError
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Database(object):
diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py
@@ -11,16 +11,10 @@
 
 import logging
 import subprocess
-import sys
 
 from devel.models import MasterKey, UserProfile
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
@@ -12,7 +12,6 @@
 import logging
 from pytz import utc
 import subprocess
-import sys
 
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
@@ -21,12 +20,7 @@
 from devel.utils import UserFinder
 
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/read_rebuilderd_status.py b/devel/management/commands/read_rebuilderd_status.py
@@ -10,7 +10,6 @@
 
 import logging
 import re
-import sys
 
 from collections import defaultdict
 
@@ -28,12 +27,7 @@
 
 EPOCH_REGEX = r'^(\d+):(.+)'
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/readlinks.py b/devel/management/commands/readlinks.py
@@ -1,20 +1,14 @@
 import logging
 import os
 import re
-import sys
 import tarfile
 
 from django.core.management.base import BaseCommand, CommandError
 
 from main.models import Repo, Package, Soname
 
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/readlinks_inotify.py b/devel/management/commands/readlinks_inotify.py
@@ -1,6 +1,5 @@
 import logging
 import pyinotify
-import sys
 import threading
 
 from django.core.management.base import BaseCommand, CommandError
@@ -10,12 +9,7 @@
 from .readlinks import read_links
 from .archweb_inotify import EventHandler
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
 
 
 def wrapper_read_links(arch, filepath, obj):
diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py
@@ -14,19 +14,14 @@
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-import sys
 import logging
 
 from devel.utils import UserFinder
 from main.models import Package
 from packages.models import FlagRequest
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
@@ -19,7 +19,6 @@
 import io
 import os
 import re
-import sys
 import xtarfile as tarfile
 import logging
 from datetime import datetime
@@ -37,14 +36,10 @@
 from packages.utils import parse_version
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
 TRACE = 5
 logging.addLevelName(TRACE, 'TRACE')
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py
@@ -16,7 +16,6 @@
 
 import logging
 import pyinotify
-import sys
 import threading
 
 from django.core.management.base import BaseCommand, CommandError
@@ -26,12 +25,9 @@
 from .reporead import read_repo
 from .archweb_inotify import EventHandler
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Command(BaseCommand):
diff --git a/devel/management/commands/retire_user.py b/devel/management/commands/retire_user.py
@@ -9,20 +9,15 @@
 """
 
 import logging
-import sys
 
 from django.contrib.auth.models import User, Group
 from django.core.management.base import BaseCommand, CommandError
 
 from devel.models import UserProfile
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format=u'%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt=u'%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 MAPPING = {
     'Developers': 'Retired Developers',
diff --git a/main/management/commands/donor_import.py b/main/management/commands/donor_import.py
@@ -30,12 +30,8 @@
 from main.models import Donor
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format=u'%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt=u'%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Command(BaseCommand):
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
@@ -19,7 +19,6 @@
 import socket
 import ssl
 import subprocess
-import sys
 import time
 import tempfile
 from threading import Thread
@@ -34,12 +33,8 @@
 from mirrors.models import MirrorUrl, MirrorLog, CheckLocation
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Command(BaseCommand):
diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py
@@ -10,18 +10,14 @@
 
 from django.core.management.base import BaseCommand
 
-import sys
 import logging
 import socket
 
 from mirrors.models import MirrorUrl
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class Command(BaseCommand):
diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py
@@ -11,7 +11,6 @@
 from datetime import datetime
 import logging
 import subprocess
-import sys
 from xml.etree.ElementTree import XML
 
 from django.conf import settings
@@ -21,12 +20,8 @@
 from ...utils import get_signoff_groups
 from devel.utils import UserFinder
 
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+
+logger = logging.getLogger("command")
 
 
 class Command(BaseCommand):
diff --git a/planet/management/commands/update_planet.py b/planet/management/commands/update_planet.py
@@ -9,7 +9,6 @@
 
 
 import logging
-import sys
 import time
 
 from datetime import datetime
@@ -26,12 +25,8 @@
 from planet.models import Feed, FeedItem, FEEDITEM_SUMMARY_LIMIT
 
 
-logging.basicConfig(
-    level=logging.WARNING,
-    format=u'%(asctime)s -> %(levelname)s: %(message)s',
-    datefmt=u'%Y-%m-%d %H:%M:%S',
-    stream=sys.stderr)
-logger = logging.getLogger()
+logger = logging.getLogger("command")
+logger.setLevel(logging.WARNING)
 
 
 class ItemOlderThenLatest(Exception):
diff --git a/settings.py b/settings.py
@@ -1,5 +1,6 @@
 # Django settings for archweb project.
 from os import path
+import sys
 
 # Set the debug values
 DEBUG = False
@@ -144,19 +145,34 @@
             '()': 'main.log.RateLimitFilter',
         }
     },
+    'formatters': {
+        'command': {
+            'format': '%(asctime)s -> %(levelname)s: %(message)s',
+            'datefmt': '%Y-%m-%d %H:%M:%S',
+        },
+    },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
             'filters': ['ratelimit'],
             'class': 'django.utils.log.AdminEmailHandler',
-        }
+        },
+        'command': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'command',
+            'stream': sys.stderr,
+        },
     },
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': True,
-        }
+        },
+        'command': {
+            'handlers': ['command'],
+            'level': 'INFO',
+        },
     },
 }
 
