From d02c1fb70a89ad655f472270e57e3914cb895b2b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 21 Sep 2009 20:41:58 +0900 Subject: [PATCH] add nullpool to db, crop newlines in logs --- anki/db.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/anki/db.py b/anki/db.py index 43f9e4e77..7182e241d 100644 --- a/anki/db.py +++ b/anki/db.py @@ -31,6 +31,7 @@ from sqlalchemy.orm import mapper, sessionmaker as _sessionmaker, relation, back object_session as _object_session, class_mapper from sqlalchemy.sql import select, text, and_ from sqlalchemy.exceptions import DBAPIError, OperationalError +from sqlalchemy.pool import NullPool import sqlalchemy # some users are still on 0.4.x.. @@ -45,6 +46,14 @@ except ImportError: from sqlalchemy import Unicode UnicodeText = Unicode +# don't allow newlines when logging +import logging +_originalLog = logging.Logger._log +def _log(self, level, msg, *arg, **kwarg): + return _originalLog( + self, level, msg.replace("\n", " "), *arg, **kwarg) +logging.Logger._log = _log + from anki.hooks import runHook # shared metadata