smokephil/ems
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

request klasse erstellt, buffer umgebaut, db-abfrage erweitert

Browse source
This commit is contained in:
Philipp Rauch 2014-01-22 18:02:24 +01:00
parent 0db4c49f7b
commit b025d35fd8
6 changed files with 157 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/switch.py
View file

@ -65,7 +65,9 @@ class Switch(Thread):
# item = query.get() #block = True
# query should be included in the result
item = 'dc_labor/device/battery'
item = self.getItem(block = True)
#item = 'device'
if self.source == MYSQL:
result = database.loop(self.cursor, item)
elif self.source == MODBUS:
@ -74,10 +76,11 @@ class Switch(Thread):
#print 'PUT:\t%s' % result
self.queue.put(result)
self.query.task_done()
if self.source == MYSQL:
sleep(float(conf['mySQL_speed']))
elif self.source == MODBUS:
sleep(0.1)
def getItem(self, block = False):
return self.queue.get(block)
return self.query.get(block)