diff options
Diffstat (limited to 'inputs')
| -rw-r--r-- | inputs/TCPInput.py | 6 | ||||
| -rw-r--r-- | inputs/UDPInput.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/inputs/TCPInput.py b/inputs/TCPInput.py index 513b853..2bc69ef 100644 --- a/inputs/TCPInput.py +++ b/inputs/TCPInput.py @@ -21,15 +21,15 @@ class TCPInput(Input): def sensingLoop(self): data = self.conn.recv(self.BUFFER_SIZE) main_log.debug('Incoming data', data) + if not data or 'end' in data: # data end, close socket main_log.debug('End in data') print 'end of stream' self.IS_RESPONDING = 0 self.conn.close() self.sock.close() - - if self.IS_RESPONDING == 1: # if 'responding', respond to the received data - #dataDict = json.loads(data) + + if self.IS_RESPONDING == 1: # if 'responding', respond to the received data try: for datagroup in data.split('\n'): if datagroup != None and datagroup != '': diff --git a/inputs/UDPInput.py b/inputs/UDPInput.py index 7d5609e..e95bd33 100644 --- a/inputs/UDPInput.py +++ b/inputs/UDPInput.py @@ -7,7 +7,7 @@ class UDPInput(Input): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.bind((HOST, PORT)) def sensingLoop(self): - (data,address) = self.sock.recvfrom(1024) - dataDict = {'data':data, 'address':address} - self.respond(dataDict) + (data,address) = self.sock.recvfrom(1024) + dataDict = {'data':data, 'address':address} + self.respond(dataDict) |