From b28b46befab52548968a19c068ad5108adaa84a8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 18 Jun 2015 16:00:20 -0500 Subject: Silence DNS errors we see too often in production Signed-off-by: Dan McGee --- mirrors/management/commands/mirrorresolv.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mirrors') diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py index 85a3c654..fcf13fda 100644 --- a/mirrors/management/commands/mirrorresolv.py +++ b/mirrors/management/commands/mirrorresolv.py @@ -54,6 +54,11 @@ def resolve_mirrors(): if newvals != oldvals: logger.debug("values changed for %s", mirrorurl) mirrorurl.save(update_fields=('has_ipv4', 'has_ipv6')) + except socket.gaierror, e: + if e.errno == socket.EAI_NONAME: + logger.debug("gaierror resolving %s: %s", mirrorurl.hostname, e) + else: + logger.warn("gaierror resolving %s: %s", mirrorurl.hostname, e) except socket.error, e: logger.warn("error resolving %s: %s", mirrorurl.hostname, e) -- cgit v1.2.3-54-g00ecf From 9b7d5bc93fb1fd7b85c01f4c8a677ae309f9d4eb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 18 Jun 2015 16:22:24 -0500 Subject: Catch SSL CertificateErrors and log them Signed-off-by: Dan McGee --- mirrors/management/commands/mirrorcheck.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mirrors') diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index 1f16a375..374643e7 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -18,6 +18,7 @@ from pytz import utc import re import socket +import ssl import subprocess import sys import time @@ -146,6 +147,10 @@ def check_mirror_url(mirror_url, location, timeout): log.is_success = False log.error = "Exception in processing HTTP request." logger.debug("failed: %s, %s", url, log.error) + except ssl.CertificateError as e: + log.is_success = False + log.error = str(e) + logger.debug("failed: %s, %s", url, log.error) except socket.timeout: log.is_success = False log.error = "Connection timed out." -- cgit v1.2.3-54-g00ecf From c12060e51bc4876ed6db2935cbc39879ce7f4f6b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 18 Jun 2015 16:31:09 -0500 Subject: Handle Django's level 3 verbosity properly Signed-off-by: Dan McGee --- devel/management/commands/generate_keyring.py | 2 +- devel/management/commands/pgp_import.py | 2 +- devel/management/commands/rematch_developers.py | 2 +- devel/management/commands/reporead.py | 2 +- devel/management/commands/reporead_inotify.py | 2 +- mirrors/management/commands/mirrorcheck.py | 2 +- mirrors/management/commands/mirrorresolv.py | 2 +- packages/management/commands/populate_signoffs.py | 2 +- packages/management/commands/signoff_report.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'mirrors') diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py index 34bcd2f8..9c52dadc 100644 --- a/devel/management/commands/generate_keyring.py +++ b/devel/management/commands/generate_keyring.py @@ -32,7 +32,7 @@ def handle(self, *args, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if len(args) < 2: diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py index 3f557fe9..7a124f77 100644 --- a/devel/management/commands/pgp_import.py +++ b/devel/management/commands/pgp_import.py @@ -38,7 +38,7 @@ def handle(self, *args, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if len(args) < 1: diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py index 7a06e084..bbb43df0 100644 --- a/devel/management/commands/rematch_developers.py +++ b/devel/management/commands/rematch_developers.py @@ -37,7 +37,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG finder = UserFinder() diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 3244d593..72061176 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -70,7 +70,7 @@ def handle(self, arch=None, filename=None, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG return read_repo(arch, filename, options) diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py index e3c720bc..1422ae26 100644 --- a/devel/management/commands/reporead_inotify.py +++ b/devel/management/commands/reporead_inotify.py @@ -45,7 +45,7 @@ def handle(self, path_template=None, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if not path_template: diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index 374643e7..1a33073a 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -58,7 +58,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.WARNING - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG timeout = options.get('timeout') diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py index fcf13fda..0e71894b 100644 --- a/mirrors/management/commands/mirrorresolv.py +++ b/mirrors/management/commands/mirrorresolv.py @@ -32,7 +32,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.WARNING - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG return resolve_mirrors() diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py index 17a05671..8a025f4e 100644 --- a/packages/management/commands/populate_signoffs.py +++ b/packages/management/commands/populate_signoffs.py @@ -38,7 +38,7 @@ def handle_noargs(self, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG return add_signoff_comments() diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py index 72fcbe1e..a5022eeb 100644 --- a/packages/management/commands/signoff_report.py +++ b/packages/management/commands/signoff_report.py @@ -44,7 +44,7 @@ def handle(self, *args, **options): logger.level = logging.ERROR elif v == 1: logger.level = logging.INFO - elif v == 2: + elif v >= 2: logger.level = logging.DEBUG if len(args) != 2: -- cgit v1.2.3-54-g00ecf