Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topics 'get_project', 'get_projects'
[yardstick.git]
/
api
/
database
/
__init__.py
diff --git
a/api/database/__init__.py
b/api/database/__init__.py
index
d7cf4f9
..
753b346
100644
(file)
--- a/
api/database/__init__.py
+++ b/
api/database/__init__.py
@@
-13,10
+13,12
@@
from sqlalchemy import create_engine
from sqlalchemy.orm import scoped_session, sessionmaker
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import scoped_session, sessionmaker
from sqlalchemy.ext.declarative import declarative_base
+from yardstick.common import constants as consts
+
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
-engine = create_engine(
'sqlite:////tmp/yardstick.db'
, convert_unicode=True)
+engine = create_engine(
consts.SQLITE
, convert_unicode=True)
db_session = scoped_session(sessionmaker(autocommit=False,
autoflush=False,
bind=engine))
db_session = scoped_session(sessionmaker(autocommit=False,
autoflush=False,
bind=engine))