Skip to content

Commit 0e2937f

Browse files
committed
Apply ruff linting rules
1 parent a227d96 commit 0e2937f

File tree

25 files changed

+120
-254
lines changed

25 files changed

+120
-254
lines changed

health_check/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Run a full check on the deployment,using a number of plugins to check internal and external services."""
1+
"""Monitor the health of your Django app and its connected services."""
22

33
from . import _version # noqa
44

health_check/cache/backends.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ class CacheBackend(BaseHealthCheckBackend):
2121
def __init__(self, backend="default"):
2222
super().__init__()
2323
self.backend = backend
24-
self.cache_key = getattr(
25-
settings, "HEALTHCHECK_CACHE_KEY", "djangohealthcheck_test"
26-
)
24+
self.cache_key = getattr(settings, "HEALTHCHECK_CACHE_KEY", "djangohealthcheck_test")
2725

2826
def identifier(self):
2927
return f"Cache backend: {self.backend}"

health_check/contrib/celery/apps.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@ def ready(self):
2424
for queue in current_app.amqp.queues:
2525
celery_class_name = "CeleryHealthCheck" + queue.title()
2626

27-
celery_class = type(
28-
celery_class_name, (CeleryHealthCheck,), {"queue": queue}
29-
)
27+
celery_class = type(celery_class_name, (CeleryHealthCheck,), {"queue": queue})
3028
plugin_dir.register(celery_class)

health_check/contrib/celery/backends.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,27 @@ def check_status(self):
1515
priority = getattr(settings, "HEALTHCHECK_CELERY_PRIORITY", None)
1616

1717
try:
18-
result = add.apply_async(
19-
args=[4, 4], expires=queue_timeout, queue=self.queue, priority=priority
20-
)
18+
result = add.apply_async(args=[4, 4], expires=queue_timeout, queue=self.queue, priority=priority)
2119
result.get(timeout=result_timeout)
2220
if result.result != 8:
23-
self.add_error(
24-
ServiceReturnedUnexpectedResult("Celery returned wrong result")
25-
)
26-
except IOError as e:
21+
self.add_error(ServiceReturnedUnexpectedResult("Celery returned wrong result"))
22+
except OSError as e:
2723
self.add_error(ServiceUnavailable("IOError"), e)
2824
except NotImplementedError as e:
2925
self.add_error(
30-
ServiceUnavailable(
31-
"NotImplementedError: Make sure CELERY_RESULT_BACKEND is set"
32-
),
26+
ServiceUnavailable("NotImplementedError: Make sure CELERY_RESULT_BACKEND is set"),
3327
e,
3428
)
3529
except TaskRevokedError as e:
3630
self.add_error(
3731
ServiceUnavailable(
38-
"TaskRevokedError: The task was revoked, likely because it spent "
39-
"too long in the queue"
32+
"TaskRevokedError: The task was revoked, likely because it spent too long in the queue"
4033
),
4134
e,
4235
)
4336
except TimeoutError as e:
4437
self.add_error(
45-
ServiceUnavailable(
46-
"TimeoutError: The task took too long to return a result"
47-
),
38+
ServiceUnavailable("TimeoutError: The task took too long to return a result"),
4839
e,
4940
)
5041
except BaseException as e:

health_check/contrib/celery_ping/backends.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ def check_status(self):
1313

1414
try:
1515
ping_result = app.control.ping(timeout=timeout)
16-
except IOError as e:
16+
except OSError as e:
1717
self.add_error(ServiceUnavailable("IOError"), e)
1818
except NotImplementedError as exc:
1919
self.add_error(
20-
ServiceUnavailable(
21-
"NotImplementedError: Make sure CELERY_RESULT_BACKEND is set"
22-
),
20+
ServiceUnavailable("NotImplementedError: Make sure CELERY_RESULT_BACKEND is set"),
2321
exc,
2422
)
2523
except BaseException as exc:
@@ -39,9 +37,7 @@ def _check_ping_result(self, ping_result):
3937
worker, response = list(result.items())[0]
4038
if response != self.CORRECT_PING_RESPONSE:
4139
self.add_error(
42-
ServiceUnavailable(
43-
f"Celery worker {worker} response was incorrect"
44-
),
40+
ServiceUnavailable(f"Celery worker {worker} response was incorrect"),
4541
)
4642
continue
4743
active_workers.append(worker)
@@ -50,9 +46,7 @@ def _check_ping_result(self, ping_result):
5046
self._check_active_queues(active_workers)
5147

5248
def _check_active_queues(self, active_workers):
53-
defined_queues = getattr(app.conf, "task_queues", None) or getattr(
54-
app.conf, "CELERY_QUEUES", None
55-
)
49+
defined_queues = getattr(app.conf, "task_queues", None) or getattr(app.conf, "CELERY_QUEUES", None)
5650

5751
if not defined_queues:
5852
return

health_check/contrib/db_heartbeat/backends.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ def check_status(self):
1515
result = cursor.fetchone()
1616

1717
if result != (1,):
18-
raise ServiceUnavailable(
19-
"Health Check query did not return the expected result."
20-
)
18+
raise ServiceUnavailable("Health Check query did not return the expected result.")
2119
except Exception as e:
2220
raise ServiceUnavailable(f"Database health check failed: {e}")

health_check/contrib/psutil/backends.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ def check_status(self):
1818
try:
1919
du = psutil.disk_usage("/")
2020
if DISK_USAGE_MAX and du.percent >= DISK_USAGE_MAX:
21-
raise ServiceWarning(
22-
"{host} {percent}% disk usage exceeds {disk_usage}%".format(
23-
host=host, percent=du.percent, disk_usage=DISK_USAGE_MAX
24-
)
25-
)
21+
raise ServiceWarning(f"{host} {du.percent}% disk usage exceeds {DISK_USAGE_MAX}%")
2622
except ValueError as e:
2723
self.add_error(ServiceReturnedUnexpectedResult("ValueError"), e)
2824

@@ -33,12 +29,8 @@ def check_status(self):
3329
memory = psutil.virtual_memory()
3430
if MEMORY_MIN and memory.available < (MEMORY_MIN * 1024 * 1024):
3531
locale.setlocale(locale.LC_ALL, "")
36-
avail = "{:n}".format(int(memory.available / 1024 / 1024))
37-
threshold = "{:n}".format(MEMORY_MIN)
38-
raise ServiceWarning(
39-
"{host} {avail} MB available RAM below {threshold} MB".format(
40-
host=host, avail=avail, threshold=threshold
41-
)
42-
)
32+
avail = f"{int(memory.available / 1024 / 1024):n}"
33+
threshold = f"{MEMORY_MIN:n}"
34+
raise ServiceWarning(f"{host} {avail} MB available RAM below {threshold} MB")
4335
except ValueError as e:
4436
self.add_error(ServiceReturnedUnexpectedResult("ValueError"), e)

health_check/contrib/rabbitmq/backends.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ def check_status(self):
1919
"""Check RabbitMQ service by opening and closing a broker channel."""
2020
logger.debug("Checking for a broker_url on django settings...")
2121

22-
broker_url_setting_key = (
23-
f"{self.namespace}_BROKER_URL" if self.namespace else "BROKER_URL"
24-
)
22+
broker_url_setting_key = f"{self.namespace}_BROKER_URL" if self.namespace else "BROKER_URL"
2523
broker_url = getattr(settings, broker_url_setting_key, None)
2624

2725
logger.debug("Got %s as the broker_url. Connecting to rabbit...", broker_url)
@@ -33,21 +31,17 @@ def check_status(self):
3331
conn.connect() # exceptions may be raised upon calling connect
3432
except ConnectionRefusedError as e:
3533
self.add_error(
36-
ServiceUnavailable(
37-
"Unable to connect to RabbitMQ: Connection was refused."
38-
),
34+
ServiceUnavailable("Unable to connect to RabbitMQ: Connection was refused."),
3935
e,
4036
)
4137

4238
except AccessRefused as e:
4339
self.add_error(
44-
ServiceUnavailable(
45-
"Unable to connect to RabbitMQ: Authentication error."
46-
),
40+
ServiceUnavailable("Unable to connect to RabbitMQ: Authentication error."),
4741
e,
4842
)
4943

50-
except IOError as e:
44+
except OSError as e:
5145
self.add_error(ServiceUnavailable("IOError"), e)
5246

5347
except BaseException as e:

health_check/contrib/redis/backends.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@ def check_status(self):
2626
conn.ping() # exceptions may be raised upon ping
2727
except ConnectionRefusedError as e:
2828
self.add_error(
29-
ServiceUnavailable(
30-
"Unable to connect to Redis: Connection was refused."
31-
),
29+
ServiceUnavailable("Unable to connect to Redis: Connection was refused."),
3230
e,
3331
)
3432
except exceptions.TimeoutError as e:
35-
self.add_error(
36-
ServiceUnavailable("Unable to connect to Redis: Timeout."), e
37-
)
33+
self.add_error(ServiceUnavailable("Unable to connect to Redis: Timeout."), e)
3834
except exceptions.ConnectionError as e:
39-
self.add_error(
40-
ServiceUnavailable("Unable to connect to Redis: Connection Error"), e
41-
)
35+
self.add_error(ServiceUnavailable("Unable to connect to Redis: Connection Error"), e)
4236
except BaseException as e:
4337
self.add_error(ServiceUnavailable("Unknown error"), e)
4438
else:

health_check/db/migrations/0001_initial.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Generated by Django 1.10.1 on 2016-09-26 18:46
2-
from __future__ import unicode_literals
32

43
from django.db import migrations, models
54

0 commit comments

Comments
 (0)