diff options
Diffstat (limited to 'src/daq/nginx-lua/s5-nginx-lua-fetch')
| -rwxr-xr-x | src/daq/nginx-lua/s5-nginx-lua-fetch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/daq/nginx-lua/s5-nginx-lua-fetch b/src/daq/nginx-lua/s5-nginx-lua-fetch index 7d13ba9..4691a1f 100755 --- a/src/daq/nginx-lua/s5-nginx-lua-fetch +++ b/src/daq/nginx-lua/s5-nginx-lua-fetch @@ -38,7 +38,6 @@ from twisted.internet.defer import Deferred from twisted.web.client import Agent from twisted.web.http_headers import Headers import socket -from time import sleep import re import simplejson as json @@ -97,7 +96,7 @@ class SFivePort(unix.ConnectedDatagramPort): # the send buffer seems to be full - let's wait a little while... # this is not really a good solution but better than the aproach # of twisted which just drops the datagram... - sleep(0.01) + time.sleep(0.01) return self.write(data) else: raise @@ -293,7 +292,7 @@ class NGXLuaFetcher(): print 'SFive: trying to connect to %s...' % (self._socket) self._connected = False self._proto = SFiveProto(self) - self._conn = SFivePort(self._socket, self._proto, _MAX_PACKET_SIZE, 0o666, None, reactor) + self._conn = SFivePort(self._socket, self._proto, _MAX_PACKET_SIZE, 0666, None, reactor) self._conn.startListening() def socketReady(self): @@ -325,7 +324,7 @@ class NGXLuaFetcher(): "bytes-sent": clients.getBytesSent() } } - self._proto.sendDatagram('%s\n' % (json.dumps(data))); + self._proto.sendDatagram('%s\n' % (json.dumps(data))) def _sendInit(self): initdata = { "version": 1, "hostname": self._hostname, @@ -340,7 +339,7 @@ class NGXLuaFetcher(): if len(initdata["streamer-id"].keys()) == 0: del initdata["streamer-id"] - self._proto.sendDatagram('%s\n' % (json.dumps(initdata))); + self._proto.sendDatagram('%s\n' % (json.dumps(initdata))) def _sendDataset(self, timestamp, duration, content_id, format, quality): clients = self._streamer[content_id][format][quality] @@ -362,7 +361,7 @@ class NGXLuaFetcher(): if len(data["streamer-id"].keys()) == 0: del data["streamer-id"] - self._proto.sendDatagram('%s\n' % (json.dumps(data))); + self._proto.sendDatagram('%s\n' % (json.dumps(data))) if __name__ == '__main__': |