fixed some issues with not properly closed sockets

pi/power.py

@@ -12,70 +12,107 @@ import requests
 def trans():
 	queuelast = time.time()
 	while True:
+		# get value from queue (blocking)
 		queuedata = powerqueue.get()
+		powerqueue.task_done()
 		queuetime = int(queuedata[0])
 		queueval = str(queuedata[1])
+		# if more than five seconds passed since last event
 		if ((queuetime - queuelast) >= 5):
+			# put payload together
 			payload =  {"val": str(queuetime) + ";" + str(queueval)}
 			if sys.stdout.isatty():
 				print("request https://strom.ccc-ffm.de:2342/get.php => "+repr(payload))
-			r = requests.post("https://strom.ccc-ffm.de:2342/get.php", data=payload, verify=False, auth=('CCC', 'Freundschaft'))
+			# send to webserver via http post
+			try:
+				r = requests.post("https://strom.ccc-ffm.de:2342/get.php", data=payload, verify=False, auth=('CCC', 'Freundschaft'), timeout=10, headers={'connection':'close'})
+			except:
+				# some exception handling needed
+				pass		
 			if sys.stdout.isatty():
-				print(r)
+				print("server response: " + str(r.status_code))
 			queuelast = queuetime
-			
+		
+		else:
+			# drop data if less than five seconds passed since last event
+			del queuedata
+			if sys.stdout.isatty():
+				print("Drop queued element")
 
 def readgpio():
+	# open gpio filehandle
 	gpio = open("/sys/class/gpio/gpio24/value", "r")
+	# setup polling
 	gpiopoll = poll()
 	gpiopoll.register(gpio, POLLERR)
+	
+	# wait for two interrupts to have a "clean" starting point
 	if sys.stdout.isatty():
 		print("wait for 2 interrupts...")
 	gpioevent = gpiopoll.poll()
 	gpio.read()
 	gpio.seek(0)
-	last = time.time()
+	if sys.stdout.isatty():
+		print("wait for 1 interrupt....")
 	gpioevent = gpiopoll.poll()
+	last = time.time()
 	gpio.read()
 	gpio.seek(0)
+	
+	# start readgpio mainloop
 	if sys.stdout.isatty():
 		print("start readgpio mainloop")
 	while True:
 		gpioevent = gpiopoll.poll()
 		gpioval = gpio.read(1)
 		gpio.seek(0)
+		# check if interrupt was a falling edge (yes, really!)
 		if gpioval == '0':
 			now = time.time()
+			# plausibility check
 			if ((now-last) >= 0.2):
+				# calculate current power consumption
 				power = round(1800 / (now-last),2)
 				if sys.stdout.isatty():
 					print("Current power consumption: " + str(power) + " Watt")
-					print(repr(gpioval))
+					print("GPIO state: " + gpioval)
+				# put measured value on queue
 				powerqueue.put([now, power])
 				last = now
+		# error if a tty is connected and a raising edge was triggered
 		else:
 			if sys.stdout.isatty():
 				print("ERROR: not a falling edge! Ignoring interrupt")
 
+
 if __name__ == "__main__":
+	# initialise gpio interfaces
 	try:
 		if not os.path.exists("/sys/class/gpio/gpio24"):
+			# if not already exported, export gpio 24
 			gpioinit = open("/sys/class/gpio/export", "w") 
 			gpioinit.write("24\n")
 			gpioinit.close()
+		# set direction of gpio 24 to "IN"
 		gpiopin = open("/sys/class/gpio/gpio24/direction", "w")
 		gpiopin.write("in")
 		gpiopin.close()
+		# set trigger to falling edge
 		gpiotype = open("/sys/class/gpio/gpio24/edge", "w")
 		gpiotype.write("falling")
 		gpiotype.close()
 	except:
+		# if not able to initialise gpios: abort with error
 		sys.stderr.write("can't initialize gpio interface\n")
 		sys.stderr.flush()
 		sys.exit(1)
-
+	# defining queue for measured values
 	powerqueue = queue.Queue()
+
+	# disable ssl "no verification" warnings
+	requests.packages.urllib3.disable_warnings()
 	
+	# initialising and starting threads
 	th1 = threading.Thread(target=readgpio)
 	th2 = threading.Thread(target=trans)
 	th1.setDaemon(True)
@@ -83,5 +120,6 @@ if __name__ == "__main__":
 	th1.start()
 	th2.start()
 	
+	#busy loop
 	while True:
 		time.sleep(1)