From 358407e786cbaf7db1ea70fc403f8df300c25f43 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 11 Nov 2019 12:01:16 +0300 Subject: [PATCH] merged develop --- project/settings/base.py | 4 +--- project/settings/development.py | 23 +++++++++-------------- project/settings/local.py | 28 +++------------------------- project/settings/production.py | 13 ------------- 4 files changed, 13 insertions(+), 55 deletions(-) diff --git a/project/settings/base.py b/project/settings/base.py index 89df2d69..ad96a2fe 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -64,7 +64,7 @@ PROJECT_APPS = [ 'news.apps.NewsConfig', 'notification.apps.NotificationConfig', 'partner.apps.PartnerConfig', - # 'product.apps.ProductConfig', Uncomment after refining task and create migrations + 'product.apps.ProductConfig', 'recipe.apps.RecipeConfig', 'search_indexes.apps.SearchIndexesConfig', 'translation.apps.TranslationConfig', @@ -74,9 +74,7 @@ PROJECT_APPS = [ 'comment.apps.CommentConfig', 'favorites.apps.FavoritesConfig', 'rating.apps.RatingConfig', - 'transfer.apps.TransferConfig', 'tag.apps.TagConfig', - 'product.apps.ProductConfig', ] EXTERNAL_APPS = [ diff --git a/project/settings/development.py b/project/settings/development.py index fd832329..b9203259 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -38,18 +38,9 @@ sentry_sdk.init( integrations=[DjangoIntegration()] ) -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': os.environ.get('DB_NAME'), - 'USER': os.environ.get('DB_USERNAME'), - 'PASSWORD': os.environ.get('DB_PASSWORD'), - 'HOST': os.environ.get('DB_HOSTNAME'), - 'PORT': os.environ.get('DB_PORT'), - }, +# DATABASE +DATABASES.update({ 'legacy': { 'ENGINE': 'django.db.backends.mysql', 'HOST': os.environ.get('MYSQL_HOSTNAME'), @@ -57,9 +48,13 @@ DATABASES = { 'NAME': os.environ.get('MYSQL_DATABASE'), 'USER': os.environ.get('MYSQL_USER'), 'PASSWORD': os.environ.get('MYSQL_PASSWORD') - } -} + }}) + + +# INSTALLED APPS +INSTALLED_APPS.append('transfer.apps.TransferConfig') + BROKER_URL = 'redis://localhost:6379/1' CELERY_RESULT_BACKEND = BROKER_URL -CELERY_BROKER_URL = BROKER_URL \ No newline at end of file +CELERY_BROKER_URL = BROKER_URL diff --git a/project/settings/local.py b/project/settings/local.py index f3c206d7..62298faa 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -34,16 +34,15 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION) # SORL thumbnails THUMBNAIL_DEBUG = True + # ADDED TRANSFER APP INSTALLED_APPS.append('transfer.apps.TransferConfig') -# ADDED LEGACY DB CONNECTOR +# DATABASES DATABASES.update({ 'legacy': { 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.17.0.1', - # 'HOST': '172.23.0.1', 'HOST': 'mysql_db', 'PORT': 3306, 'NAME': 'dev', @@ -89,28 +88,6 @@ LOGGING = { } - -DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': os.environ.get('DB_NAME'), - 'USER': os.environ.get('DB_USERNAME'), - 'PASSWORD': os.environ.get('DB_PASSWORD'), - 'HOST': os.environ.get('DB_HOSTNAME'), - 'PORT': os.environ.get('DB_PORT'), - }, - 'legacy': { - 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.17.0.1', - # 'HOST': '172.23.0.1', - 'HOST': 'mysql_db', - 'PORT': 3306, - 'NAME': 'dev', - 'USER': 'dev', - 'PASSWORD': 'octosecret123' - } -} - # ELASTICSEARCH SETTINGS ELASTICSEARCH_DSL = { 'default': { @@ -123,6 +100,7 @@ ELASTICSEARCH_INDEX_NAMES = { 'search_indexes.documents.establishment': 'local_establishment', } + TESTING = sys.argv[1:2] == ['test'] if TESTING: ELASTICSEARCH_INDEX_NAMES = {} diff --git a/project/settings/production.py b/project/settings/production.py index a531a2ae..fe8618dd 100644 --- a/project/settings/production.py +++ b/project/settings/production.py @@ -40,19 +40,6 @@ sentry_sdk.init( integrations=[DjangoIntegration()] ) -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': os.environ.get('DB_NAME'), - 'USER': os.environ.get('DB_USERNAME'), - 'PASSWORD': os.environ.get('DB_PASSWORD'), - 'HOST': os.environ.get('DB_HOSTNAME'), - 'PORT': os.environ.get('DB_PORT'), - }, -} BROKER_URL = 'redis://redis:6379/1' CELERY_RESULT_BACKEND = BROKER_URL