Merge lp:~stefanor/ibid/log-race-655645 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Logs in logs might not be in recent_logs (we love you, GC)

I almost backported an OrderedDict with WeakValue support, then I realised the obvious solution...

[Max Rabkin (max-rabkin)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/log.py'
--- ibid/plugins/log.py	2010-10-01 14:16:38 +0000
+++ ibid/plugins/log.py	2010-10-09 14:30:56 +0000
@@ -117,12 +117,16 @@
                         break
                 else:
                     chmod(filename, int(self.private_mode, 8))
+            else:
+                # recent_logs is an LRU cache, we'll be moving log to the
+                # front of the queue, if it's in the queue.
+                # It might not be, GCs are fickle LP: 655645
+                try:
+                    self.recent_logs.remove(log)
+                except ValueError:
+                    pass
 
-                if len(self.recent_logs) > self.fd_cache:
-                    self.recent_logs.pop()
-            else:
-                self.recent_logs.remove(log)
-            self.recent_logs.insert(0, log)
+            self.recent_logs = [log] + self.recent_logs[:self.fd_cache - 1]
             return log
         finally:
             self.lock.release()