Skip to content

Commit dee04db

Browse files
gerrod3jobselko
authored andcommitted
Convert all settings.get to getattr
Turning off dynaconf's boxify requires we now use getattr
1 parent 72083d7 commit dee04db

4 files changed

Lines changed: 17 additions & 14 deletions

File tree

pulpcore/app/redis_connection.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77

88

99
def _redis_is_needed():
10-
return settings.get("CACHE_ENABLED") or settings.get("WORKER_TYPE") == "redis"
10+
return (
11+
getattr(settings, "CACHE_ENABLED", None)
12+
or getattr(settings, "WORKER_TYPE", None) == "redis"
13+
)
1114

1215

1316
def _get_connection_from_class(redis_class):
1417
if not _redis_is_needed():
1518
return None
16-
redis_url = settings.get("REDIS_URL")
19+
redis_url = getattr(settings, "REDIS_URL", None)
1720
if redis_url is not None:
1821
return redis_class.from_url(redis_url)
1922
else:

pulpcore/app/tasks/importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
549549
#
550550
# By default (setting is not-set), import will continue to use 100% of the available
551551
# workers.
552-
import_workers_percent = int(settings.get("IMPORT_WORKERS_PERCENT", 100))
552+
import_workers_percent = int(getattr(settings, "IMPORT_WORKERS_PERCENT", 100))
553553
total_workers = AppStatus.objects.online().filter(app_type="worker").count()
554554
import_workers = max(1, int(total_workers * (import_workers_percent / 100.0)))
555555

pulpcore/app/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ def configure_analytics():
487487
dispatch_interval = timedelta(days=1)
488488
name = "Post Anonymous Analytics Periodically"
489489
analytics = settings.ANALYTICS
490-
if settings.get("TELEMETRY") is not None:
490+
if getattr(settings, "TELEMETRY", None) is not None:
491491
deprecation_logger.warning("TELEMETRY setting is deprecated. Use ANALYTICS.")
492492
analytics = settings.TELEMETRY
493493
if analytics:

pulpcore/tasking/kafka.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ def send_task_notification(task):
2424

2525
_logger = logging.getLogger(__name__)
2626
_kafka_producer = None
27-
_producer_poll_timeout = settings.get("KAFKA_PRODUCER_POLL_TIMEOUT")
28-
_security_protocol = settings.get("KAFKA_SECURITY_PROTOCOL")
29-
_ssl_ca_pem = settings.get("KAFKA_SSL_CA_PEM")
30-
_sasl_mechanism = settings.get("KAFKA_SASL_MECHANISM")
31-
_sasl_username = settings.get("KAFKA_SASL_USERNAME")
32-
_sasl_password = settings.get("KAFKA_SASL_PASSWORD")
33-
34-
_kafka_tasks_status_topic = settings.get("KAFKA_TASKS_STATUS_TOPIC")
35-
_kafka_tasks_status_producer_sync_enabled = settings.get(
36-
"KAFKA_TASKS_STATUS_PRODUCER_SYNC_ENABLED"
27+
_producer_poll_timeout = getattr(settings, "KAFKA_PRODUCER_POLL_TIMEOUT", None)
28+
_security_protocol = getattr(settings, "KAFKA_SECURITY_PROTOCOL", None)
29+
_ssl_ca_pem = getattr(settings, "KAFKA_SSL_CA_PEM", None)
30+
_sasl_mechanism = getattr(settings, "KAFKA_SASL_MECHANISM", None)
31+
_sasl_username = getattr(settings, "KAFKA_SASL_USERNAME", None)
32+
_sasl_password = getattr(settings, "KAFKA_SASL_PASSWORD", None)
33+
34+
_kafka_tasks_status_topic = getattr(settings, "KAFKA_TASKS_STATUS_TOPIC", None)
35+
_kafka_tasks_status_producer_sync_enabled = getattr(
36+
settings, "KAFKA_TASKS_STATUS_PRODUCER_SYNC_ENABLED", None
3737
)
3838

3939
class KafkaProducerPollingWorker:

0 commit comments

Comments
 (0)