pymscada 0.1.11b5__py3-none-any.whl → 0.1.11b6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of pymscada might be problematic. Click here for more details.
- pymscada/www_server.py +8 -20
- {pymscada-0.1.11b5.dist-info → pymscada-0.1.11b6.dist-info}/METADATA +1 -1
- {pymscada-0.1.11b5.dist-info → pymscada-0.1.11b6.dist-info}/RECORD +6 -6
- {pymscada-0.1.11b5.dist-info → pymscada-0.1.11b6.dist-info}/WHEEL +0 -0
- {pymscada-0.1.11b5.dist-info → pymscada-0.1.11b6.dist-info}/entry_points.txt +0 -0
- {pymscada-0.1.11b5.dist-info → pymscada-0.1.11b6.dist-info}/licenses/LICENSE +0 -0
pymscada/www_server.py
CHANGED
|
@@ -56,27 +56,15 @@ class WSHandler():
|
|
|
56
56
|
try:
|
|
57
57
|
while True:
|
|
58
58
|
as_bytes, message = await self.queue.get()
|
|
59
|
-
if
|
|
60
|
-
logging.debug(f'{self.rta_id}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
else:
|
|
66
|
-
await self.ws.send_json(message)
|
|
67
|
-
except ConnectionResetError:
|
|
68
|
-
logging.debug(f'{self.rta_id}: Connection reset, stopping send_queue')
|
|
69
|
-
break
|
|
70
|
-
except Exception as e:
|
|
71
|
-
logging.warning(f'{self.rta_id}: Error sending message: {e}')
|
|
72
|
-
break
|
|
59
|
+
if as_bytes:
|
|
60
|
+
# logging.debug(f'{self.rta_id} as bytes {message}')
|
|
61
|
+
await self.ws.send_bytes(message)
|
|
62
|
+
else:
|
|
63
|
+
# logging.debug(f'{self.rta_id} as json {message}')
|
|
64
|
+
await self.ws.send_json(message)
|
|
73
65
|
except asyncio.CancelledError:
|
|
74
|
-
logging.
|
|
75
|
-
|
|
76
|
-
# Clean up subscriptions when the connection ends
|
|
77
|
-
for tag in self.tag_by_id.values():
|
|
78
|
-
tag.del_callback_id(self.notify_id)
|
|
79
|
-
tag.del_callback(self.publish)
|
|
66
|
+
logging.warning(f'{self.rta_id}: send queue error, close '
|
|
67
|
+
f'{self.ws.exception()}')
|
|
80
68
|
|
|
81
69
|
def publish(self, tag: Tag):
|
|
82
70
|
"""
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
pymscada-0.1.
|
|
2
|
-
pymscada-0.1.
|
|
3
|
-
pymscada-0.1.
|
|
4
|
-
pymscada-0.1.
|
|
1
|
+
pymscada-0.1.11b6.dist-info/METADATA,sha256=ckk2bdF2U_M0aPsS5Aq3E9PtT4MZeVjq6dp1TAsAwIs,2349
|
|
2
|
+
pymscada-0.1.11b6.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
|
|
3
|
+
pymscada-0.1.11b6.dist-info/entry_points.txt,sha256=j_UgZmqFhNquuFC2M8g5-8X9FCpp2RaDb7NrExzkj1c,72
|
|
4
|
+
pymscada-0.1.11b6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
5
5
|
pymscada/__init__.py,sha256=NV_cIIwe66Ugp8ns426rtfJIIyskWbqwImD9p_5p0bQ,739
|
|
6
6
|
pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
|
|
7
7
|
pymscada/bus_client.py,sha256=ZUCynJtEvmHruzLS6ZAzp-_0dv1A1u_POgemb38kHuc,8989
|
|
@@ -65,5 +65,5 @@ pymscada/tag.py,sha256=Oxh70q2MrPAEI94v4QsWt4gD8QP6BlfzNv9xXeeUFys,10103
|
|
|
65
65
|
pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
|
|
66
66
|
pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
|
|
67
67
|
pymscada/validate.py,sha256=fPMlP6RscYuTIgdEJjJ0ZZI0OyVSat1lpqg254wqpdE,13140
|
|
68
|
-
pymscada/www_server.py,sha256
|
|
69
|
-
pymscada-0.1.
|
|
68
|
+
pymscada/www_server.py,sha256=rV1Vsk3J1wBhFMBCnK33SziNuTGgVwNc5zLjQQFxJ-s,12021
|
|
69
|
+
pymscada-0.1.11b6.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|