Rev4460, Fix mergersite update on slow storage

Author: shortcutme

plugins/MergerSite/MergerSitePlugin.py

@@ -345,9 +345,9 @@ class SiteManagerPlugin(object):
     def updateMergerSites(self):
         global merger_db, merged_db, merged_to_merger, site_manager
         s = time.time()
-        merger_db = {}
-        merged_db = {}
-        merged_to_merger = {}
+        merger_db_new = {}
+        merged_db_new = {}
+        merged_to_merger_new = {}
         site_manager = self
         if not self.sites:
             return
@@ -359,7 +359,7 @@ def updateMergerSites(self):
                 self.log.error("Error loading site %s: %s" % (site.address, Debug.formatException(err)))
                 continue
             if merged_type:
-                merged_db[site.address] = merged_type
+                merged_db_new[site.address] = merged_type
 
             # Update merger sites
             for permission in site.settings["permissions"]:
@@ -373,18 +373,24 @@ def updateMergerSites(self):
                     site.settings["permissions"].remove(permission)
                     continue
                 merger_type = permission.replace("Merger:", "")
-                if site.address not in merger_db:
-                    merger_db[site.address] = []
-                merger_db[site.address].append(merger_type)
+                if site.address not in merger_db_new:
+                    merger_db_new[site.address] = []
+                merger_db_new[site.address].append(merger_type)
                 site_manager.sites[site.address] = site
 
             # Update merged to merger
             if merged_type:
                 for merger_site in self.sites.values():
                     if "Merger:" + merged_type in merger_site.settings["permissions"]:
                         if site.address not in merged_to_merger:
-                            merged_to_merger[site.address] = []
-                        merged_to_merger[site.address].append(merger_site)
+                            merged_to_merger_new[site.address] = []
+                        merged_to_merger_new[site.address].append(merger_site)
+
+        # Update globals
+        merger_db = merger_db_new
+        merged_db = merged_db_new
+        merged_to_merger = merged_to_merger_new
+
         self.log.debug("Updated merger sites in %.3fs" % (time.time() - s))
 
     def load(self, *args, **kwags):

src/Config.py

@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.1"
-        self.rev = 4458
+        self.rev = 4460
         self.argv = argv
         self.action = None
         self.test_parser = None