update stats every 5 minutes, and reduce munin timeout to 6min

jolivain · Jun 17, 2018 · 4830c8b · 4830c8b
1 parent c3aa82d
commit 4830c8b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/misc/munin/wormhole_active b/misc/munin/wormhole_active
@@ -40,7 +40,7 @@ channel_db = sqlite3.connect(channeldbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 nameplates = channel_db.execute("SELECT COUNT() FROM `nameplates`").fetchone()[0]

diff --git a/misc/munin/wormhole_errors b/misc/munin/wormhole_errors
@@ -35,7 +35,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 r1 = usage_db.execute("SELECT COUNT() FROM `nameplates`").fetchone()[0]

diff --git a/misc/munin/wormhole_event_rate b/misc/munin/wormhole_event_rate
@@ -45,7 +45,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 atm = defaultdict(int)

diff --git a/misc/munin/wormhole_events b/misc/munin/wormhole_events
@@ -45,7 +45,7 @@ usage_db = sqlite3.connect(usagedbfile)
 MINUTE = 60.0
 updated,rebooted,blur = usage_db.execute(
     "SELECT `updated`,`rebooted`,`blur_time` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 if blur is not None:
     rebooted = blur * (rebooted // blur)

diff --git a/misc/munin/wormhole_events_alltime b/misc/munin/wormhole_events_alltime
@@ -44,7 +44,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 for mood in ["happy", "scary", "lonely", "errory", "pruney", "crowded"]:

diff --git a/src/wormhole_mailbox_server/server_tap.py b/src/wormhole_mailbox_server/server_tap.py
@@ -65,7 +65,7 @@ def opt_websocket_protocol_option(self, arg):
 
 # CHANNEL_EXPIRATION_TIME should be longer than EXPIRATION_CHECK_PERIOD
 CHANNEL_EXPIRATION_TIME = 11*MINUTE
-EXPIRATION_CHECK_PERIOD = 10*MINUTE
+EXPIRATION_CHECK_PERIOD = 5*MINUTE
 
 def makeService(config, channel_db="relay.sqlite", reactor=reactor):
     increase_rlimits()