X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/fa2004af2aafefcc66f8668c29f373fbcfdfaffb..bc0d1aec669d34e142900e562b07dec0696f0160:/tuerd?ds=sidebyside

diff --git a/tuerd b/tuerd
index 1d49f65..5884d13 100755
--- a/tuerd
+++ b/tuerd
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-import time, socket, os, stat, atexit
+import time, socket, os, stat, atexit, errno
 from datetime import datetime
 import RPi.GPIO as GPIO
 GPIO.setmode(GPIO.BOARD)
@@ -23,6 +23,15 @@ def doNothing (conn):
 	waynesend(conn,b"0")
 	pass
 
+# delete a file, don't care if it did not exist in the first place
+def forcerm(name):
+	try:
+		os.unlink (name)
+	except OSError as e:
+		# only ignore error if it was "file didn't exist"
+		if e.errno != errno.ENOENT:
+			raise
+
 # commands: on a pin do a series of timed on/off switches
 class Pinoutput:
 	# name is for logging and also used for mapping command names to instances of this class
@@ -63,12 +72,12 @@ for pin in pinlist:
 # create socket
 sock = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM)
 # delete old socket file and don't bitch around if it's not there
-try:
-	os.unlink (socketname)
-except OSError:
-	pass
+forcerm(socketname)
 # bind socket to file name
 sock.bind (socketname)
+# ensure we close and delete the socket when we quit (atexit.register is LIFO!)
+atexit.register(forcerm, socketname)
+atexit.register(sock.close)
 # allow only users in the tuergroup to write to the socket
 os.chown (socketname, 0, tuergroupid)
 os.chmod (socketname, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP)