Merge "[API]: Debug fixes"

This commit is contained in:
Jenkins
2013-09-26 09:46:43 +00:00
committed by Gerrit Code Review
2 changed files with 10 additions and 3 deletions

View File

@@ -32,7 +32,7 @@ from sqlalchemy.exc import OperationalError, ResourceClosedError
def format_exception(excinfo, debug=False):
"""Extract informations that can be sent to the client."""
error = excinfo[1]
error = excinfo[0]
log = logging.getLogger(__name__)
if isinstance(error, wsme.exc.ClientSideError):
r = dict(message="Bad Request",

View File

@@ -171,6 +171,11 @@ class RoutingSession(Session):
def _build_engines(self):
config = ConfigParser.SafeConfigParser()
config.read([conf.conffile])
if 'debug' in conf.app and conf.app.debug:
echo = True
else:
echo = False
for section in conf.database:
db_conf = config._sections[section]
@@ -191,12 +196,14 @@ class RoutingSession(Session):
engine = create_engine(
conn_string, isolation_level="READ COMMITTED",
pool_size=20, connect_args=ssl_args, pool_recycle=3600
pool_size=20, connect_args=ssl_args, pool_recycle=3600,
echo=echo
)
else:
engine = create_engine(
conn_string, isolation_level="READ COMMITTED",
pool_size=20, pool_recycle=3600
pool_size=20, pool_recycle=3600,
echo=echo
)
RoutingSession.engines[RoutingSession.engines_count] = engine
RoutingSession.engines_count += 1