diff --git a/opbeans/__init__.py b/opbeans/__init__.py index a450832..cf2e85f 100644 --- a/opbeans/__init__.py +++ b/opbeans/__init__.py @@ -1,2 +1 @@ from .celery import app as celery_app -default_app_config = 'opbeans.apps.OpbeansAppConfig' diff --git a/opbeans/settings.py b/opbeans/settings.py index ffd4f7c..37d8c20 100644 --- a/opbeans/settings.py +++ b/opbeans/settings.py @@ -110,8 +110,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True @@ -205,6 +203,7 @@ } structlog_processors=[ + structlog.contextvars.merge_contextvars, structlog.stdlib.filter_by_level, structlog.processors.TimeStamper(fmt="iso", key="@timestamp"), structlog.stdlib.add_logger_name, @@ -227,7 +226,7 @@ structlog.configure( processors=structlog_processors, - context_class=structlog.threadlocal.wrap_dict(dict), + context_class=dict, logger_factory=structlog.stdlib.LoggerFactory(), wrapper_class=structlog.stdlib.BoundLogger, cache_logger_on_first_use=True, diff --git a/opbeans/tasks.py b/opbeans/tasks.py index 90fb906..762eb65 100644 --- a/opbeans/tasks.py +++ b/opbeans/tasks.py @@ -4,7 +4,7 @@ from django.db import models as m import elasticapm -from elasticsearch import TransportError +from elasticsearch import NotFoundError from elasticsearch.helpers import bulk from elasticsearch_dsl import Search from elasticsearch_dsl.connections import connections @@ -36,9 +36,8 @@ def sync_orders(): try: r = Search(index='py-orders').sort('-_id')[0].execute() highest_id = int(r.hits[0].meta.id) - except TransportError as e: - if e.status_code == 404: - highest_id = 0 + except NotFoundError: + highest_id = 0 order_docs = [] for order in models.Order.objects.filter(id__gt=highest_id).prefetch_related('customer'): order_docs.append(documents.Order(**order.to_search()).to_dict(include_meta=True)) diff --git a/requirements.txt b/requirements.txt index 84e552c..0bafd12 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ elasticsearch==8.17.2 elasticsearch-dsl==8.17.1 elastic-transport==8.17.1 gunicorn==23.0.0 -honcho==1.1.0 +honcho==2.0.0 kombu==5.5.2 psycopg2-binary==2.9.10 pytz