Fix mysql_lesia_uri import exception

hitier
1 parent 7e08aa0c
Showing 3 changed files with 9 additions and 3 deletions Show diff stats
app/commands/commands.py
pdc_config.py
resources/db_config.py
@@ -2,6 +2,7 @@ import sys
 import click
 import random
  
+from flask import current_app
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.sql import func
 from sqlalchemy.ext.automap import automap_base
@@ -10,8 +11,6 @@ from sqlalchemy import create_engine
  
 from app.models import db, User, Agent, Service, Project, Capacity, Period, Charge
  
-from db_config import mysql_lesia_uri
-
 from . import bp
  
  
@@ -23,7 +22,7 @@ def feed_from_lesia():
     """
     Base = automap_base()
  
-    engine = create_engine(mysql_lesia_uri)
+    engine = create_engine(current_app.config['LESIA_AGENTS_DB_URI'])
  
     # reflect the tables
     try:
@@ -25,6 +25,12 @@ class Config(object):
         SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or \
                                   'sqlite:///' + os.path.join(root_dir, 'pdc_app.db')
  
+    try:
+        LESIA_AGENTS_DB_URI = mysql_lesia_uri
+    except NameError:
+        LESIA_AGENTS_DB_URI = os.environ.get('LESIA_AGENTS_DB_URI') or \
+                              'sqlite:///' + os.path.join(root_dir, 'lesia.db')
+
     with open(os.path.join(root_dir, 'VERSION.txt')) as version_file:
         VERSION = version_file.read().strip()
  
@@ -39,6 +39,7 @@ POSTGRESTEST = {
 }
 postgres_test_uri = 'postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % POSTGRESTEST
  
+# The lesia mysql agents database
 MYSQL_LESIA = {
     'user': 'mysql',
     'pw': 'mysql',