X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/960dd08b9c20e339762ba9dab8977f29b05ac522..78609160138984cdd732e2a27c73f4dbd7a12935:/concept_spaceapi.py

diff --git a/concept_spaceapi.py b/concept_spaceapi.py
index e991463..0f251d7 100644
--- a/concept_spaceapi.py
+++ b/concept_spaceapi.py
@@ -1,24 +1,40 @@
-
+from threading import Lock
 
 class SpaceApi:
-	__init__ (self):
-		self.state_to_set = None # public write, TODO: getters, setters?
-		self.state_last_set = None # public read
+	__init__ (self, waker):
+		self._state_to_set = None
+		self._state_last_set = None
 		self._running = True
-		self._t = threading.Thread(target=self.loop)
-		_t.start()
+		self.set_state = ThreadFunction(self._set_state, "Space API")
+		self._set_state_lock = Lock()
+		waker.register(self.set_state, 10.0) # re-try setting the state every 10 seconds
 	
 	def stop (self):
-		self._running = False
+		self.set_state.stop()
 	
-	def loop (self):
-		while self._running:
-			if (self.state_to_set is not None):
-				if self.state_to_set != self.state_last_set:
-					stts = self.state_to_set # cache for parallelism
-					error = do_request(stts) # TODO
-					#TODO logging
-					if not error:
-						self.state_last_set = stts
-						#TODO logging
-			time.sleep(SPACE_API_LOOP_DELAY)
\ No newline at end of file
+	# set_state is the asynchronous version of _set_state (see __init__)
+	def _set_state (self, state = None):
+		'''Sets the state, if None: leave state unchanged and re-try if previous attempts failed'''
+		if state is not None:
+			self._state_to_set = state
+		else:
+			# always have a local variable because of parallelism
+			state = self._state_to_set
+		
+		if not self._set_state_lock.acquire(False):
+			# we don't want many threads to wait here
+			# the next status update will fix everything anyways
+			pass
+		else:
+			# got the lock
+			try:
+				# check if there's something we need to do
+				if self._state_last_set == state: return
+				# take action!
+				error = do_request(stts) # TODO
+				#TODO logging
+				#TODO error too often -> log critical to send mails
+				if not error:
+					self.state_last_set = stts
+			finally:
+				self._set_state_lock.release()