afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed broker from session, updated most places using broker to use alternative logic to compensate where needed

Browse source
This commit is contained in:
Blake Harnden 2019-10-15 14:13:42 -07:00
parent 6570f22ccf
commit b2d2705849
19 changed files with 151 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/nodes/base.py
View file

@ -199,7 +199,9 @@ class NodeBase(object):
x, y, _ = self.getposition()
model = self.type
emulation_server = self.server.host
emulation_server = None
if self.server is not None:
emulation_server = self.server.host
services = self.services
if services is not None:
@ -593,7 +595,13 @@ class CoreNode(CoreNodeBase):
:param str sh: shell to execute command in
:return: str
"""
return self.client.create_cmd(sh)
terminal = self.client.create_cmd(sh)
if self.server is None:
return terminal
else:
return "ssh -X -f {host} xterm -e {terminal}".format(
host=self.server.host, terminal=terminal
)
def privatedir(self, path):
"""