Merge branch 'master' into core-rest-flask
This commit is contained in:
commit
832f3e3ee5
5 changed files with 14 additions and 19 deletions
|
@ -854,12 +854,13 @@ class CoreEmu(object):
|
|||
for session in sessions.itervalues():
|
||||
session.shutdown()
|
||||
|
||||
def create_session(self, _id=None, master=True):
|
||||
def create_session(self, _id=None, master=True, _cls=EmuSession):
|
||||
"""
|
||||
Create a new CORE session, set to master if running standalone.
|
||||
|
||||
:param int _id: session id for new session
|
||||
:param bool master: sets session to master
|
||||
:param class _cls: EmuSession class to use
|
||||
:return: created session
|
||||
:rtype: EmuSession
|
||||
"""
|
||||
|
@ -871,7 +872,7 @@ class CoreEmu(object):
|
|||
if session_id not in self.sessions:
|
||||
break
|
||||
|
||||
session = EmuSession(session_id, config=self.config)
|
||||
session = _cls(session_id, config=self.config)
|
||||
logger.info("created session: %s", session_id)
|
||||
if master:
|
||||
session.master = True
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue