canonicalize time for accurate sorting

diff --git a/actions.py b/actions.py
index ce7bfc6a95c7d3190ccbd20f8d0f6f6fffe35d23..054f886e2b9a4726c150eaa0b7c0dd20b10de565 100644 (file)
--- a/actions.py
+++ b/actions.py
@@ -181,7 +181,7 @@ class KeyExpirer:
        reactor.callLater(const.KEINITIAL_DELAY, self.doExpire)
        
     def doExpire(self):
-       self.cut = `time() - const.KE_AGE`
+       self.cut = "%0.6f" % (time() - const.KE_AGE)
        self._expire()
        
     def _expire(self):

diff --git a/khashmir.py b/khashmir.py
index 9c7b2ef68c7b05cc5e3cee1b11245922ce677990..93061f5e302d16cc42e9a54cd253c3a52fab476b 100644 (file)
--- a/khashmir.py
+++ b/khashmir.py
@@ -258,15 +258,15 @@ class Khashmir(xmlrpc.XMLRPC):
        return nodes, self.node.senderDict()
            
     def xmlrpc_store_value(self, key, value, sender):
-       t = `time.time()`
-       s = "insert into kv values ('%s', '%s', '%s')" % (key, value, t)
+       t = "%0.6f" % time.time()
+       s = "insert into kv values ('%s', '%s', '%s');" % (key, value, t)
        c = self.store.cursor()
        try:
            c.execute(s)
        except pysqlite_exceptions.IntegrityError, reason:
            if reason == 'constraint failed':
                # update last insert time
-               s = "update kv set time = '%s' where key = '%s' and value = %s" % (key, value)
+               s = "update kv set time = '%s' where key = '%s' and value = %s; commit;" % (t, key, value)
                c.execute(s)
            else:
                raise pysqlite_exceptions.IntegrityError, reason