summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/unitofwork.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-02-28 17:43:10 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-02-28 17:43:10 +0000
commitba015e62cc1c688b11a7b8f916867f123a6fe206 (patch)
treee88563a37f0e4b60484986d55b3ad03903fe7232 /lib/sqlalchemy/orm/unitofwork.py
parent3328792ebcc6af92c9c4e486e755a43300f6a279 (diff)
downloadsqlalchemy-ba015e62cc1c688b11a7b8f916867f123a6fe206.tar.gz
- orm: Removed a lot of logging that nobody really cares about,
logging that remains will respond to live changes in the log level. No significant overhead is added. [ticket:1719] - engine: Opened up logging a bit such that isEnabledFor() is called more often, so that changes to the log level for engine/pool will be reflected on next connect. This adds a small amount of method call overhead. It's negligible and will make life a lot easier for all those situations when logging just happens to be configured after create_engine() is called. [ticket:1719]
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
-rw-r--r--lib/sqlalchemy/orm/unitofwork.py25
1 files changed, 8 insertions, 17 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index d2901a49f..4a694bc33 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -122,19 +122,13 @@ class UOWTransaction(object):
else:
return history.as_state()
- def register_object(self, state, isdelete=False, listonly=False, postupdate=False, post_update_cols=None):
+ def register_object(self, state, isdelete=False,
+ listonly=False, postupdate=False, post_update_cols=None):
# if object is not in the overall session, do nothing
if not self.session._contains_state(state):
- if self._should_log_debug:
- self.logger.debug("object %s not part of session, not registering for flush",
- mapperutil.state_str(state))
return
- if self._should_log_debug:
- self.logger.debug("register object for flush: %s isdelete=%s listonly=%s postupdate=%s",
- mapperutil.state_str(state), isdelete, listonly, postupdate)
-
mapper = _state_mapper(state)
task = self.get_task_by_mapper(mapper)
@@ -256,11 +250,10 @@ class UOWTransaction(object):
break
tasks = self._sort_dependencies()
- if self._should_log_info:
+ if self._should_log_info():
self.logger.info("Task dump:\n%s", self._dump(tasks))
UOWExecutor().execute(self, tasks)
- if self._should_log_info:
- self.logger.info("Execute Complete")
+ self.logger.info("Execute Complete")
def _dump(self, tasks):
from uowdumper import UOWDumper
@@ -296,16 +289,14 @@ class UOWTransaction(object):
for item, cycles in nodes:
task = self.get_task_by_mapper(item)
if cycles:
- for t in task._sort_circular_dependencies(self, [self.get_task_by_mapper(i) for i in cycles]):
+ for t in task._sort_circular_dependencies(
+ self,
+ [self.get_task_by_mapper(i) for i in cycles]
+ ):
ret.append(t)
else:
ret.append(task)
- if self._should_log_debug:
- self.logger.debug("Dependent tuples:\n" + "\n".join(
- "(%s->%s)" % (d[0].class_.__name__, d[1].class_.__name__)
- for d in self.dependencies))
- self.logger.debug("Dependency sort:\n%s", ret)
return ret
log.class_logger(UOWTransaction)