diff --git a/src/database/AltConnector.py b/src/database/AltConnector.py index c84e990f7dff42a52385c462ec43b97150964d2a..d7717c3fa7d922d18b254321f3d4528317e2ab75 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 10af87fa9aa7e509558762600acb1ed11a3c4423..78802452fcfc20929a38ce20b471144971167e8d 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