Changeset: ece85c5d8d31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ece85c5d8d31
Modified Files:
clients/iotapi/src/WebSockets/websockets.py
clients/iotclient/src/Streams/datatypes.py
Branch: iot
Log Message:
Small corrections
diffs (104 lines):
diff --git a/clients/iotapi/src/WebSockets/websockets.py
b/clients/iotapi/src/WebSockets/websockets.py
--- a/clients/iotapi/src/WebSockets/websockets.py
+++ b/clients/iotapi/src/WebSockets/websockets.py
@@ -30,7 +30,7 @@ def unsubscribe_removed_streams(concaten
client.remove_subscribed_stream(name)
WebClientsLock.release()
for name in concatenated_names:
- add_log(20, ''.join(['Stream removed: ', name]))
+ add_log(20, ''.join(['Stream ', name, ' removed']))
class IOTAPI(WebSocket):
@@ -81,7 +81,7 @@ class IOTAPI(WebSocket):
self._subscriptions[concatenated_name] = stream
self._locker.release()
self.sendMessage({"subscribed": "Subscribed to " + concatenated_name})
- add_log(20, ''.join(['Client ', self.address[0], 'subscribed stream ',
concatenated_name]))
+ add_log(20, ''.join(['Client ', self.address[0], 'subscribed to stream
', concatenated_name]))
def unsubscribe(self, concatenated_name):
self._locker.acquire_write()
@@ -92,27 +92,31 @@ class IOTAPI(WebSocket):
del self._subscriptions[concatenated_name]
self._locker.release()
self.sendMessage({"unsubscribed": "Unsubscribed to " +
concatenated_name})
- add_log(20, ''.join(['Client ', self.address[0], ' unsubscribed
stream ', concatenated_name]))
+ add_log(20, ''.join(['Client ', self.address[0], ' unsubscribed to
stream ', concatenated_name]))
def remove_subscribed_stream(self, concatenated_name):
self._locker.acquire_write()
if concatenated_name in self._subscriptions:
del self._subscriptions[concatenated_name]
self._locker.release()
- self.sendMessage({"removed": "Stream removed from context: " +
concatenated_name})
+ self.sendMessage({"removed": 'Stream ' + concatenated_name + ' removed
from context'})
def send_notification_message(self, concatenated_name, schema_name,
stream_name, count):
self._locker.acquire_read()
if concatenated_name in self._subscriptions:
self._locker.release()
self.sendMessage({'notification': {'schema': schema_name,
'stream': stream_name, 'tuples': count}})
- add_log(20, ''.join(['Stream notification sent to client ',
self.address[0]]))
+ add_log(20, ''.join(['Stream ', concatenated_name, ' notification
sent to client ', self.address[0]]))
else:
self._locker.release()
def read_stream_batch(self, concatenated_name, basket_number, limit,
offset):
- stream = Streams_context.get_existing_stream(concatenated_name)
- self.sendMessage(stream.read_tuples(basket_number, limit, offset))
+ try:
+ stream = Streams_context.get_existing_stream(concatenated_name)
+ self.sendMessage(stream.read_tuples(basket_number, limit, offset))
+ except BaseException as ex:
+ self.sendMessage({"error": ex})
+ add_log(50, ex)
def init_websockets(host, port):
diff --git a/clients/iotclient/src/Streams/datatypes.py
b/clients/iotclient/src/Streams/datatypes.py
--- a/clients/iotclient/src/Streams/datatypes.py
+++ b/clients/iotclient/src/Streams/datatypes.py
@@ -288,16 +288,14 @@ class INetType(StreamDataType):
if entry == self.get_nullable_constant():
array[7] = 1
- return array
-
- components = re.split(r'[./]+', entry)
- for i in range(4):
- array[i] = int(components[i])
- if len(components) > 4: # if it has a mask add it to the array
- array[4] = int(components[4])
else:
- array[4] = 32
-
+ components = re.split(r'[./]+', entry)
+ for i in xrange(4):
+ array[i] = int(components[i])
+ if len(components) > 4: # if it has a mask add it to the array
+ array[4] = int(components[4])
+ else:
+ array[4] = 32
return array
def pack_parsed_values(self, extracted_values, counter, parameters):
@@ -323,7 +321,7 @@ class UUIDType(StreamDataType):
j = 0
s = 0
- for i in range(16):
+ for i in xrange(16):
if j in (8, 12, 16, 20): # do nothing with the dashes
s += 1
@@ -338,8 +336,8 @@ class UUIDType(StreamDataType):
s += 1
j += 1
array[i] <<= 4
+
next_char = ord(entry[s])
-
if 48 <= next_char <= 57: # between '0' and '9'
array[i] |= next_char - 48
elif 97 <= next_char <= 102: # between 'a' and 'f'
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
