From a3b75d0967092dbd77ef40be39598e44ba05231d Mon Sep 17 00:00:00 2001 From: Aaron Garibay Date: Wed, 20 Sep 2023 10:07:01 -0700 Subject: [PATCH 1/3] not calling dangerous reset if the client don't answer --- .../management/commands/es_dangerous_reset.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/django_elastic_migrations/management/commands/es_dangerous_reset.py b/django_elastic_migrations/management/commands/es_dangerous_reset.py index 954361a..b53e354 100644 --- a/django_elastic_migrations/management/commands/es_dangerous_reset.py +++ b/django_elastic_migrations/management/commands/es_dangerous_reset.py @@ -1,6 +1,7 @@ from django.core.management import call_command from django_elastic_migrations import DEMIndexManager +from django_elastic_migrations import es_client from django_elastic_migrations.management.commands.es import ESCommand from django_elastic_migrations.models import Index from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger @@ -31,6 +32,9 @@ def add_arguments(self, parser): def handle(self, *args, **options): es_only = options.get('es_only') + if not es_client or not es_client.ping(): + return + if es_only: msg = "Dangerously resetting Elasticsearch indexes from database in ./manage.py es_dangerous_reset --es-only!" logger.warning(msg) From bf0235b16861b3fbda6e6aed5ac67e74c997a499 Mon Sep 17 00:00:00 2001 From: Aaron Garibay Date: Wed, 20 Sep 2023 11:50:30 -0700 Subject: [PATCH 2/3] adding error handling --- django_elastic_migrations/apps.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/django_elastic_migrations/apps.py b/django_elastic_migrations/apps.py index 31c36d7..86fde3b 100644 --- a/django_elastic_migrations/apps.py +++ b/django_elastic_migrations/apps.py @@ -18,4 +18,9 @@ class DjangoElasticMigrationsConfig(AppConfig): def ready(self): # avoid race condition with django app initialization from django_elastic_migrations.indexes import DEMIndexManager - DEMIndexManager.initialize(create_versions=True, activate_versions=True) + try: + DEMIndexManager.initialize(create_versions=True, activate_versions=True) + except ConnectionError as e: + return + except Exception as e: + raise e From 23f13ec79a4fadfe45a9ab29b067f76d803cfd82 Mon Sep 17 00:00:00 2001 From: Samuel Braganza Z Date: Mon, 24 Mar 2025 12:37:44 -0500 Subject: [PATCH 3/3] Updated .gitignore file --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 899966e..45c1ca3 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ requirements/private.txt # Development task artifacts default.db + +.eggs/ +venv/ \ No newline at end of file