Support passing timeout to the StormCachingBuildFarm.

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index 709784f4ce6f589f07e077e170ec1c8174b6e191..faf3cbf6197e54ba4d336e86fb4dab268e1365ab 100644 (file)
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -199,18 +199,19 @@ class StormCachingBuildResultStore(BuildResultStore):
 
 class StormCachingBuildFarm(BuildFarm):
 
-    def __init__(self, path=None, store=None):
+    def __init__(self, path=None, store=None, timeout=0.5):
+        self.timeout = timeout
         self.store = store
         super(StormCachingBuildFarm, self).__init__(path)
 
     def _get_store(self):
         if self.store is not None:
             return self.store
-        else:
-            db = create_database("sqlite:" + os.path.join(self.path, "hostdb.sqlite"))
-            self.store = Store(db)
-            setup_schema(self.store)
-            return self.store
+        db_path = os.path.join(self.path, "hostdb.sqlite")
+        db = create_database("sqlite:%s?timeout=%f" % (db_path, self.timeout))
+        self.store = Store(db)
+        setup_schema(self.store)
+        return self.store
 
     def _open_hostdb(self):
         return StormHostDatabase(self._get_store())

diff --git a/import-and-analyse.py b/import-and-analyse.py
index d88ef437c40896e7506665c4a24699e6ef7ba351..f6f0c2cb262f3e018c840d9d55c780f02641c311 100755 (executable)
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -23,7 +23,7 @@ parser.add_option("--verbose", help="Be verbose", action="count")
 
 (opts, args) = parser.parse_args()
 
-buildfarm = StormCachingBuildFarm()
+buildfarm = StormCachingBuildFarm(timeout=40.0)
 
 smtp = smtplib.SMTP()
 smtp.connect()

diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py
index 8300ba0467d4f233261dc4430a302ee4b2416bde..2e0c7f73ea3ee98d2a3c8491444bcedd7446cb44 100755 (executable)
--- a/mail-dead-hosts.py
+++ b/mail-dead-hosts.py
@@ -27,7 +27,7 @@ parser = optparse.OptionParser()
 parser.add_option("--dry-run", help="Don't actually send any emails.", action="store_true")
 (opts, args) = parser.parse_args()
 
-buildfarm = StormCachingBuildFarm()
+buildfarm = StormCachingBuildFarm(timeout=40.0)
 db = buildfarm.hostdb
 
 smtp = smtplib.SMTP()