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

removed master from corehandlers and session, since it will not be needed any more

Browse source
This commit is contained in:
bharnden 2019-10-25 22:06:30 -07:00
parent 77c7bf798e
commit fff281a452
6 changed files with 34 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/emulator/coreemu.py
View file

@ -86,12 +86,11 @@ class CoreEmu:
session = sessions[_id]
session.shutdown()
def create_session(self, _id=None, master=True, _cls=Session):
def create_session(self, _id=None, _cls=Session):
"""
Create a new CORE session, set to master if running standalone.
Create a new CORE session.
:param int _id: session id for new session
:param bool master: sets session to master
:param class _cls: Session class to use
:return: created session
:rtype: EmuSession
@ -104,9 +103,6 @@ class CoreEmu:
session = _cls(_id, config=self.config)
logging.info("created session: %s", _id)
if master:
session.master = True
self.sessions[_id] = session
return session

26
daemon/core/emulator/session.py
View file

@ -85,7 +85,6 @@ class Session:
:param bool mkdir: flag to determine if a directory should be made
"""
self.id = _id
self.master = False
# define and create session directory when desired
self.session_dir = os.path.join(tempfile.gettempdir(), f"pycore.{self.id}")
@ -1694,28 +1693,19 @@ class Session:
prefixes = prefix_spec.split()
if len(prefixes) > 1:
# a list of per-host prefixes is provided
assign_address = True
if self.master:
try:
# split first (master) entry into server and prefix
prefix = prefixes[0].split(":", 1)[1]
except IndexError:
# no server name. possibly only one server
prefix = prefixes[0]
# len(prefixes) == 1
try:
# split first (master) entry into server and prefix
prefix = prefixes[0].split(":", 1)[1]
except IndexError:
# no server name. possibly only one server
prefix = prefixes[0]
else:
# TODO: can we get the server name from the servers.conf or from the node
# assignments?o
# with one prefix, only master gets a ctrlnet address
assign_address = self.master
prefix = prefixes[0]
logging.info(
"controlnet(%s) prefix(%s) assign(%s) updown(%s) serverintf(%s)",
"controlnet(%s) prefix(%s) updown(%s) serverintf(%s)",
_id,
prefix,
assign_address,
updown_script,
server_interface,
)
@ -1723,7 +1713,7 @@ class Session:
cls=CtrlNet,
_id=_id,
prefix=prefix,
assign_address=assign_address,
assign_address=True,
updown_script=updown_script,
serverintf=server_interface,
)