From 49b6e85963ef55fb6cfa1876fe825730f95658bc Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Nov 2016 00:47:13 +0100
Subject: Parallelise merge_fetch.py.

NOTE: Not supporting permdb yet!

We're still not passing the tests because merge_backup.py exits when
the secondary merge disappears.
---
 tools/merge_dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/merge_dist.py')

diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index 7a13bfa..b018f63 100755
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -167,7 +167,7 @@ def main():
             return 1
         sth_statinfo_old = sth_statinfo
         while sth_statinfo == sth_statinfo_old:
-            sleep(args.mergeinterval / 30)
+            sleep(max(3, args.mergeinterval / 10))
             sth_statinfo = stat(sth_path)
     return 0
 
-- 
cgit v1.1