Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion synapse-api
3 changes: 0 additions & 3 deletions synapse/client/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@


class Device(object):
sockets = None

def __init__(self, uri, verbose=False):
if not uri:
raise ValueError("URI cannot be empty or none")
Expand Down Expand Up @@ -204,5 +202,4 @@ def _handle_status_response(self, status):
self.logger.error("Error %d: %s", status.code, status.message)
return False
else:
self.sockets = status.sockets
return True
14 changes: 1 addition & 13 deletions synapse/server/nodes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import logging
from typing import List, Tuple

from synapse.api.datatype_pb2 import DataType
from synapse.api.node_pb2 import NodeConfig, NodeSocket, NodeType
from synapse.api.node_pb2 import NodeConfig, NodeType
from synapse.server.status import Status
from synapse.utils.ndtp_types import SynapseData

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

def node_socket(self):
if self.socket is None:
return False

return NodeSocket(
node_id=self.id,
data_type=DataType.kAny,
bind=f"{self.socket[0]}:{self.socket[1]}",
type=self.type,
)

def tap_connections(self):
return []
12 changes: 0 additions & 12 deletions synapse/server/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ async def Info(self, request, context):
status=Status(
message=None,
code=StatusCode.kOk,
sockets=self._sockets_status_info(),
state=self.state,
),
peripherals=self.peripherals,
Expand All @@ -111,14 +110,12 @@ async def Configure(self, request, context):
return Status(
message="Failed to configure",
code=StatusCode.kUndefinedError,
sockets=self._sockets_status_info(),
state=self.state,
)

return Status(
message=None,
code=StatusCode.kOk,
sockets=self._sockets_status_info(),
state=self.state,
)

Expand All @@ -128,13 +125,11 @@ async def Start(self, request, context):
return Status(
message="Failed to start streaming",
code=StatusCode.kUndefinedError,
sockets=self._sockets_status_info(),
state=self.state,
)
return Status(
message=None,
code=StatusCode.kOk,
sockets=self._sockets_status_info(),
state=self.state,
)

Expand All @@ -144,13 +139,11 @@ async def Stop(self, request, context):
return Status(
message="Failed to stop streaming",
code=StatusCode.kUndefinedError,
sockets=self._sockets_status_info(),
state=self.state,
)
return Status(
message=None,
code=StatusCode.kOk,
sockets=self._sockets_status_info(),
state=self.state,
)

Expand All @@ -163,7 +156,6 @@ async def Query(self, request, context):
status=Status(
message="Device is not running",
code=StatusCode.kUndefinedError,
sockets=self._sockets_status_info(),
state=self.state,
),
)
Expand All @@ -179,7 +171,6 @@ async def Query(self, request, context):
status=Status(
message=None,
code=StatusCode.kOk,
sockets=self._sockets_status_info(),
state=self.state,
),
list_taps_response=ListTapsResponse(taps=taps),
Expand Down Expand Up @@ -387,9 +378,6 @@ async def _stop_streaming(self):
self.logger.info("Streaming stopped.")
return True

def _sockets_status_info(self):
return [node.node_socket() for node in self.nodes if node.socket]

def _synapse_api_version(self):
if self.synapse_api_version is None:
return 0
Expand Down