From 9be04145d0d9ddb7a0cf4376a7e7290566d0c279 Mon Sep 17 00:00:00 2001
From: Gusev Anton <gusev_aa@groupbwt.com>
Date: Mon, 17 Jun 2019 13:55:28 +0300
Subject: [PATCH] change settings for AltConnector
---
src/database/AltConnector.py | 13 ++++++-------
src/settings.py | 18 ++++++++++++------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/database/AltConnector.py b/src/database/AltConnector.py
index c84e990..d7717c3 100644
--- a/src/database/AltConnector.py
+++ b/src/database/AltConnector.py
@@ -1,7 +1,6 @@
from scrapy.conf import settings
from utils.Singleton import Singleton
import MySQLdb as sql
-import os
class AltConnector(metaclass=Singleton):
@@ -10,12 +9,12 @@ class AltConnector(metaclass=Singleton):
@staticmethod
def get_connection():
if not AltConnector.__connection:
- # TODO cant use db-port
AltConnector.__connection = sql.connect(
- os.getenv('DB_HOST'),
- os.getenv('DB_USERNAME'),
- os.getenv('DB_PASSWORD'),
- os.getenv('DB_DATABASE'),
+ settings['DB_HOST'],
+ settings['DB_USERNAME'],
+ settings['DB_PASSWORD'],
+ settings['DB_DATABASE'],
charset='utf8',
- port=int(os.getenv('DB_PORT')))
+ port=settings['DB_PORT']
+ )
return AltConnector.__connection
diff --git a/src/settings.py b/src/settings.py
index 10af87f..7880245 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -97,13 +97,19 @@ ITEM_PIPELINES = {
# HTTPCACHE_IGNORE_HTTP_CODES = []
# HTTPCACHE_STORAGE = 'scrapy.extensions.httpcache.FilesystemCacheStorage'
+DB_CONNECTION = os.getenv('DB_CONNECTION')
+DB_USERNAME = os.getenv('DB_USERNAME')
+DB_PASSWORD = os.getenv('DB_PASSWORD')
+DB_HOST = os.getenv('DB_HOST')
+DB_PORT = int(os.getenv('DB_PORT'))
+DB_DATABASE = os.getenv('DB_DATABASE')
CONNECTION_STRING = "{drivername}://{user}:{passwd}@{host}:{port}/{db_name}?charset=utf8".format(
- drivername=os.getenv('DB_CONNECTION'),
- user=os.getenv('DB_USERNAME'),
- passwd=os.getenv('DB_PASSWORD'),
- host=os.getenv('DB_HOST'),
- port=os.getenv('DB_PORT'),
- db_name=os.getenv('DB_DATABASE'),
+ drivername=DB_CONNECTION,
+ user=DB_USERNAME,
+ passwd=DB_PASSWORD,
+ host=DB_HOST,
+ port=str(DB_PORT),
+ db_name=DB_DATABASE,
)
# Logger config
--
GitLab