update for testing config

This commit is contained in:
peng.xu 2019-09-28 11:22:46 +08:00
parent 7220af2cd1
commit 4051cf7e07
5 changed files with 14 additions and 5 deletions

View File

@ -7,8 +7,12 @@ from mishards.server import Server
grpc_server = Server()
def create_app(testing_config=None):
import logging
logger = logging.getLogger()
config = testing_config if testing_config else settings.DefaultConfig
db.init_db(uri=config.SQLALCHEMY_DATABASE_URI, echo=config.SQL_ECHO)
logger.info(db)
from mishards.connections import ConnectionMgr
connect_mgr = ConnectionMgr()

View File

@ -24,6 +24,10 @@ class DB:
self.uri = uri
self.session = sessionmaker()
self.session.configure(bind=self.engine)
self.url = url
def __str__(self):
return '<DB: backend={};database={}>'.format(self.url.get_backend_name(), self.url.database)
@property
def Session(self):

View File

@ -5,7 +5,7 @@ from mishards import (
settings, create_app)
def main():
server = create_app()
server = create_app(settings.TestingConfig if settings.TESTING else settings.DefaultConfig)
server.run(port=settings.SERVER_PORT)
return 0

View File

@ -90,7 +90,6 @@ class Server:
self.on_pre_run()
self.start(port)
logger.info('Successfully')
logger.info('Listening on port {}'.format(port))
try:

View File

@ -64,9 +64,11 @@ class DefaultConfig:
SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_URI')
SQL_ECHO = env.bool('SQL_ECHO', False)
# class TestingConfig(DefaultConfig):
# SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_TEST_URI')
# SQL_ECHO = env.bool('SQL_TEST_ECHO', False)
TESTING = env.bool('TESTING', False)
if TESTING:
class TestingConfig(DefaultConfig):
SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_TEST_URI')
SQL_ECHO = env.bool('SQL_TEST_ECHO', False)
if __name__ == '__main__':