Skip to content

Commit 70242b4

Browse files
authored
Feature: remove node sockets (#152)
* Feature: remove node sockets * remove sneaky ones
1 parent 5fde112 commit 70242b4

4 files changed

Lines changed: 2 additions & 29 deletions

File tree

synapse-api

synapse/client/device.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626

2727
class Device(object):
28-
sockets = None
29-
3028
def __init__(self, uri, verbose=False):
3129
if not uri:
3230
raise ValueError("URI cannot be empty or none")
@@ -204,5 +202,4 @@ def _handle_status_response(self, status):
204202
self.logger.error("Error %d: %s", status.code, status.message)
205203
return False
206204
else:
207-
self.sockets = status.sockets
208205
return True

synapse/server/nodes/base.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
import logging
33
from typing import List, Tuple
44

5-
from synapse.api.datatype_pb2 import DataType
6-
from synapse.api.node_pb2 import NodeConfig, NodeSocket, NodeType
5+
from synapse.api.node_pb2 import NodeConfig, NodeType
76
from synapse.server.status import Status
87
from synapse.utils.ndtp_types import SynapseData
98

@@ -61,16 +60,5 @@ async def emit_data(self, data):
6160
for node in self.downstream_nodes:
6261
asyncio.create_task(node.on_data_received(data))
6362

64-
def node_socket(self):
65-
if self.socket is None:
66-
return False
67-
68-
return NodeSocket(
69-
node_id=self.id,
70-
data_type=DataType.kAny,
71-
bind=f"{self.socket[0]}:{self.socket[1]}",
72-
type=self.type,
73-
)
74-
7563
def tap_connections(self):
7664
return []

synapse/server/rpc.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ async def Info(self, request, context):
9696
status=Status(
9797
message=None,
9898
code=StatusCode.kOk,
99-
sockets=self._sockets_status_info(),
10099
state=self.state,
101100
),
102101
peripherals=self.peripherals,
@@ -111,14 +110,12 @@ async def Configure(self, request, context):
111110
return Status(
112111
message="Failed to configure",
113112
code=StatusCode.kUndefinedError,
114-
sockets=self._sockets_status_info(),
115113
state=self.state,
116114
)
117115

118116
return Status(
119117
message=None,
120118
code=StatusCode.kOk,
121-
sockets=self._sockets_status_info(),
122119
state=self.state,
123120
)
124121

@@ -128,13 +125,11 @@ async def Start(self, request, context):
128125
return Status(
129126
message="Failed to start streaming",
130127
code=StatusCode.kUndefinedError,
131-
sockets=self._sockets_status_info(),
132128
state=self.state,
133129
)
134130
return Status(
135131
message=None,
136132
code=StatusCode.kOk,
137-
sockets=self._sockets_status_info(),
138133
state=self.state,
139134
)
140135

@@ -144,13 +139,11 @@ async def Stop(self, request, context):
144139
return Status(
145140
message="Failed to stop streaming",
146141
code=StatusCode.kUndefinedError,
147-
sockets=self._sockets_status_info(),
148142
state=self.state,
149143
)
150144
return Status(
151145
message=None,
152146
code=StatusCode.kOk,
153-
sockets=self._sockets_status_info(),
154147
state=self.state,
155148
)
156149

@@ -163,7 +156,6 @@ async def Query(self, request, context):
163156
status=Status(
164157
message="Device is not running",
165158
code=StatusCode.kUndefinedError,
166-
sockets=self._sockets_status_info(),
167159
state=self.state,
168160
),
169161
)
@@ -179,7 +171,6 @@ async def Query(self, request, context):
179171
status=Status(
180172
message=None,
181173
code=StatusCode.kOk,
182-
sockets=self._sockets_status_info(),
183174
state=self.state,
184175
),
185176
list_taps_response=ListTapsResponse(taps=taps),
@@ -387,9 +378,6 @@ async def _stop_streaming(self):
387378
self.logger.info("Streaming stopped.")
388379
return True
389380

390-
def _sockets_status_info(self):
391-
return [node.node_socket() for node in self.nodes if node.socket]
392-
393381
def _synapse_api_version(self):
394382
if self.synapse_api_version is None:
395383
return 0

0 commit comments

Comments
 (0)