Skip to content

Commit f1290c3

Browse files
author
Richard Jones
committed
Fix some broken logging.
Remove (broken and incorrect) optimisation added to set_inner multilink handling.
1 parent 98d1077 commit f1290c3

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

roundup/backends/back_mysql.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ def db_nuke(config):
6666
# stupid MySQL bug requires us to drop all the tables first
6767
for table in tables:
6868
command = 'DROP TABLE `%s`'%table[0]
69-
self.log_debug(command)
69+
logging.debug(command)
7070
cursor.execute(command)
7171
command = "DROP DATABASE %s"%config.RDBMS_NAME
72-
self.log_info(command)
72+
logging.info(command)
7373
cursor.execute(command)
7474
conn.commit()
7575
conn.close()
@@ -83,7 +83,7 @@ def db_create(config):
8383
conn = MySQLdb.connect(**kwargs)
8484
cursor = conn.cursor()
8585
command = "CREATE DATABASE %s"%config.RDBMS_NAME
86-
self.log_info(command)
86+
logging.info(command)
8787
cursor.execute(command)
8888
conn.commit()
8989
conn.close()

roundup/backends/rdbms_common.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,12 +1740,6 @@ def set_inner(self, nodeid, **propvalues):
17401740

17411741
# handle additions
17421742
for id in value:
1743-
# If this node is in the cache, then we do not need to go to
1744-
# the database. (We don't consider this an LRU hit, though.)
1745-
if self.cache.has_key((classname, nodeid)):
1746-
# Return 1, not True, to match the type of the result of
1747-
# the SQL operation below.
1748-
return 1
17491743
if not self.db.getclass(link_class).hasnode(id):
17501744
raise IndexError, '%s has no node %s'%(link_class, id)
17511745
if id in l:

0 commit comments

Comments
 (0)