From: Ralf Jung <post@ralfj.de>
Date: Sat, 23 Nov 2013 12:23:56 +0000 (+0100)
Subject: ignore socket timeouts; refine tuer-warnstate-nervlist
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/7a99a7eb3b2f2c539836875d2cc8ea15a42ea49f?ds=sidebyside;hp=5871e71831a0938f6bfb36f6a90e00fd7284e367

ignore socket timeouts; refine tuer-warnstate-nervlist
---

diff --git a/statemachine.py b/statemachine.py
index 5ad83dd..b647ac9 100644
--- a/statemachine.py
+++ b/statemachine.py
@@ -13,6 +13,15 @@ def play_sound (what):
 	soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)
 	fire_and_forget_cmd ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ")
 
+# convert an absolute nervlist to a relative one
+def nervlist_abs2rel(nervlist_abs):
+	nervlist_rel = []
+	last_t = 0
+	for (t, f) in nervlist_abs:
+		assert t >= last_t
+		nervlist_rel.append((t-last_t, f))
+	return nervlist_rel
+
 
 # StateUnlocking constants
 OPEN_REPEAT_TIMEOUT = 7
@@ -26,10 +35,12 @@ CLOSE_REPEAT_NUMBER = 3
 FALLBACK_LEAVE_DELAY_LOCK = 5 # seconds
 
 # StateAboutToOpen constants
-ABOUTOPEN_NERVLIST = [(5, lambda : play_sound("flipswitch")), (5, lambda:play_sound("flipswitch")), (0, lambda:logger.warning("Space open but switch not flipped for 10 seconds")),\
-	(10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (0, lambda:logger.error("Space open but switch not flipped for 30 seconds")),\
-	(10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (6, lambda:play_sound("flipswitch")), (4, lambda:logger.critical("Space open but switch not flipped for 60 seconds")),
-	(59*60, lambda:logger.critical("Space open but switch not flipped for one hour"))]
+ABOUTOPEN_NERVLIST = nervlist_abs2rel([(5, lambda : play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")),\
+	(20, lambda:play_sound("flipswitch")), (30, lambda:play_sound("flipswitch")), (30, lambda:logger.error("Space open but switch not flipped for 30 seconds")),\
+	(40, lambda:play_sound("flipswitch")), (50, lambda:play_sound("flipswitch")), (60, lambda:play_sound("flipswitch")),
+	(60, lambda:logger.critical("Space open but switch not flipped for 60 seconds")), (120, lambda:play_sound("flipswitch")),
+	(10*60, lambda:logger.critical("Space open but switch not flipped for 10 minutes")),
+	(60*60, lambda:logger.critical("Space open but switch not flipped for one hour"))])
 
 # Timeout we wait after the switch was switched to "Closed", until we assume nobody will open the door and we just lock it
 # ALso the time we wait after the door was opend, till we assume something went wrong and start nerving
diff --git a/tysock.py b/tysock.py
index 11b5183..676f573 100644
--- a/tysock.py
+++ b/tysock.py
@@ -71,8 +71,11 @@ class TySocket():
 					# _answer will be called, and it will close the connection
 				else:
 					waynesend(conn, 'Command not found')
-					conn.close()
 			except KeyboardInterrupt:
 				raise # forward Ctrl-C to the outside
+			except socket.timeout:
+				# it's okay
+				logger.info("TySocket: Connection timed out")
 			except Exception as e:
 				logger.critical("TySocket: Something went wrong: %s" % str(e))
+			conn.close()