kallithea Changeset - 5b3568c99cc3

Changeset - 5b3568c99cc3

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

domruf - 9 years ago 2017-05-09 17:49:31
dominikruf@gmail.com

sqlalchemy: remove echo setting from .ini files and create_engine

Instead of 'echo' the normal logging configration should be used.

Follow the advice from
https://docs.sqlalchemy.org/en/rel_1_1/core/engines.html#configuring-logging
which says "when using Python logging, ensure all echo flags are set to False
at all times".

6 files changed with 4 insertions and 8 deletions:

development.ini

kallithea/lib/db_manage.py

kallithea/lib/paster_commands/setup_db.py

kallithea/lib/paster_commands/template.ini.mako

kallithea/tests/fixture.py

kallithea/tests/test.ini

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -500,13 +500,12 @@ sqlalchemy.url = sqlite:///%(here)s/kall @@
 # MySQL
 #sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
 # see sqlalchemy docs for others
 sqlalchemy.echo = false
 sqlalchemy.pool_recycle = 3600
 ################################
 ### ALEMBIC CONFIGURATION   ####
 ################################

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -60,18 +60,17 @@ def notify(msg): @@
     """
     ml = len(msg) + (4 * 2)
     print('\n%s\n*** %s ***\n%s' % ('*' * ml, msg, '*' * ml)).upper()
 class DbManage(object):
-    def __init__(self, log_sql, dbconf, root, tests=False, SESSION=None, cli_args=None):
     def __init__(self, dbconf, root, tests=False, SESSION=None, cli_args=None):
         self.dbname = dbconf.split('/')[-1]
         self.tests = tests
         self.root = root
         self.dburi = dbconf
         self.log_sql = log_sql
         self.db_exists = False
         self.cli_args = cli_args or {}
         self.init_db(SESSION=SESSION)
     def _ask_ok(self, msg):
         """Invoke ask_ok unless the force_ask option provides the answer"""
@@ @@ -83,13 +82,13 @@ class DbManage(object): @@
     def init_db(self, SESSION=None):
         if SESSION:
             self.sa = SESSION
         else:
             #init new sessions
-            engine = create_engine(self.dburi, echo=self.log_sql)
             engine = create_engine(self.dburi)
             init_model(engine)
             self.sa = Session()
     def create_tables(self, override=False):
         """
         Create a auth database

kallithea/lib/paster_commands/setup_db.py

➞

Show inline comments

@@ @@ -92,13 +92,13 @@ class Command(BasePasterCommand): @@
     def take_action(self, opts):
         path_to_ini_file = os.path.realpath(opts.config_file)
         conf = paste.deploy.appconfig('config:' + path_to_ini_file)
         dbconf = conf['sqlalchemy.url']
-        dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
         dbmanage = DbManage(dbconf=dbconf, root=conf['here'],
                             tests=False, cli_args=vars(opts))
         dbmanage.create_tables(override=True)
         opts = dbmanage.config_prompt(None)
         dbmanage.create_settings(opts)
         dbmanage.create_default_user()
         dbmanage.admin_prompt()

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -504,13 +504,12 @@ sqlalchemy.url = postgresql://user:pass@ @@
 # MySQL
 sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
 %endif
 # see sqlalchemy docs for others
 sqlalchemy.echo = false
 sqlalchemy.pool_recycle = 3600
 <%text>################################</%text>
 <%text>### ALEMBIC CONFIGURATION   ####</%text>
 <%text>################################</%text>

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -326,13 +326,13 @@ def create_test_env(repos_test_path, con @@
     # create test dir if it doesn't exist
     if not os.path.isdir(repos_test_path):
         log.debug('Creating testdir %s', repos_test_path)
         os.makedirs(repos_test_path)
-    dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=config['here'],
     dbmanage = DbManage(dbconf=dbconf, root=config['here'],
                         tests=True)
     dbmanage.create_tables(override=True)
     # for tests dynamically set new root paths based on generated content
     dbmanage.create_settings(dbmanage.config_prompt(repos_test_path))
     dbmanage.create_default_user()
     dbmanage.admin_prompt()

kallithea/tests/test.ini

➞

Show inline comments

@@ @@ -503,13 +503,12 @@ sqlalchemy.url = sqlite:///%(here)s/kall @@
 # MySQL
 #sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
 # see sqlalchemy docs for others
 sqlalchemy.echo = false
 sqlalchemy.pool_recycle = 3600
 ################################
 ### ALEMBIC CONFIGURATION   ####
 ################################

0 comments (0 inline, 0 general)