diff options
Diffstat (limited to 'rpki/sql.py')
| -rw-r--r-- | rpki/sql.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/rpki/sql.py b/rpki/sql.py index 65a3b85c..536ebbe2 100644 --- a/rpki/sql.py +++ b/rpki/sql.py @@ -32,6 +32,7 @@ SQL interface code. """ +import logging import weakref from rpki.mysql_import import (MySQLdb, _mysql_exceptions) @@ -41,6 +42,8 @@ import rpki.resource_set import rpki.sundial import rpki.log +logger = logging.getLogger(__name__) + class session(object): """ SQL session layer. @@ -95,7 +98,7 @@ class session(object): return func(query, args) except _mysql_exceptions.MySQLError: if self.dirty: - rpki.log.warn("MySQL exception with dirty objects in SQL cache!") + logger.warning("MySQL exception with dirty objects in SQL cache!") raise def execute(self, query, args = None): @@ -115,7 +118,7 @@ class session(object): Clear the SQL object cache. Shouldn't be necessary now that the cache uses weak references, but should be harmless. """ - rpki.log.debug("Clearing SQL cache") + logger.debug("Clearing SQL cache") self.assert_pristine() self.cache.clear() @@ -131,7 +134,7 @@ class session(object): """ for s in self.dirty.copy(): #if s.sql_cache_debug: - rpki.log.debug("Sweeping (%s) %r" % ("deleting" if s.sql_deleted else "storing", s)) + logger.debug("Sweeping (%s) %r" % ("deleting" if s.sql_deleted else "storing", s)) if s.sql_deleted: s.sql_delete() else: @@ -242,7 +245,7 @@ class sql_persistent(object): if where is None: assert args is None and also_from is None if cls.sql_debug: - rpki.log.debug("sql_fetch_where(%r)" % cls.sql_template.select) + logger.debug("sql_fetch_where(%r)" % cls.sql_template.select) gctx.sql.execute(cls.sql_template.select) else: query = cls.sql_template.select @@ -250,7 +253,7 @@ class sql_persistent(object): query += "," + also_from query += " WHERE " + where if cls.sql_debug: - rpki.log.debug("sql_fetch_where(%r, %r)" % (query, args)) + logger.debug("sql_fetch_where(%r, %r)" % (query, args)) gctx.sql.execute(query, args) results = [] for row in gctx.sql.fetchall(): @@ -279,7 +282,7 @@ class sql_persistent(object): Mark this object as needing to be written back to SQL. """ if self.sql_cache_debug and not self.sql_is_dirty: - rpki.log.debug("Marking %r SQL dirty" % self) + logger.debug("Marking %r SQL dirty" % self) self.gctx.sql.dirty.add(self) def sql_mark_clean(self): @@ -287,7 +290,7 @@ class sql_persistent(object): Mark this object as not needing to be written back to SQL. """ if self.sql_cache_debug and self.sql_is_dirty: - rpki.log.debug("Marking %r SQL clean" % self) + logger.debug("Marking %r SQL clean" % self) self.gctx.sql.dirty.discard(self) @property @@ -311,14 +314,14 @@ class sql_persistent(object): args = self.sql_encode() if not self.sql_in_db: if self.sql_debug: - rpki.log.debug("sql_store(%r, %r)" % (self.sql_template.insert, args)) + logger.debug("sql_store(%r, %r)" % (self.sql_template.insert, args)) self.gctx.sql.execute(self.sql_template.insert, args) setattr(self, self.sql_template.index, self.gctx.sql.lastrowid()) self.gctx.sql.cache[(self.__class__, self.gctx.sql.lastrowid())] = self self.sql_insert_hook() else: if self.sql_debug: - rpki.log.debug("sql_store(%r, %r)" % (self.sql_template.update, args)) + logger.debug("sql_store(%r, %r)" % (self.sql_template.update, args)) self.gctx.sql.execute(self.sql_template.update, args) self.sql_update_hook() key = (self.__class__, getattr(self, self.sql_template.index)) @@ -333,7 +336,7 @@ class sql_persistent(object): if self.sql_in_db: id = getattr(self, self.sql_template.index) # pylint: disable=W0622 if self.sql_debug: - rpki.log.debug("sql_delete(%r, %r)" % (self.sql_template.delete, id)) + logger.debug("sql_delete(%r, %r)" % (self.sql_template.delete, id)) self.sql_delete_hook() self.gctx.sql.execute(self.sql_template.delete, (id,)) key = (self.__class__, id) |