daemon: Do some session cleanup if an error occurs when importing an
XML scenario.
This commit is contained in:
parent
d56f26b5d6
commit
b9ebcd979c
1 changed files with 6 additions and 1 deletions
|
@ -935,7 +935,12 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
|
||||||
filename = sys.argv[0]
|
filename = sys.argv[0]
|
||||||
if os.path.splitext(filename)[1].lower() == '.xml':
|
if os.path.splitext(filename)[1].lower() == '.xml':
|
||||||
session = server.getsession(useexisting=False)
|
session = server.getsession(useexisting=False)
|
||||||
opensessionxml(session, filename, start=True)
|
try:
|
||||||
|
opensessionxml(session, filename, start=True)
|
||||||
|
except:
|
||||||
|
session.shutdown()
|
||||||
|
server.delsession(session)
|
||||||
|
raise
|
||||||
else:
|
else:
|
||||||
t = threading.Thread(target = execfile,
|
t = threading.Thread(target = execfile,
|
||||||
args=(filename, {'__file__': filename,
|
args=(filename, {'__file__': filename,
|
||||||
|
|
Loading…
Add table
Reference in a new issue