From 1f10a81d1a25bbf115e5b3fa4202f5a9395def8a Mon Sep 17 00:00:00 2001 From: "tgoff0@gmail.com" Date: Wed, 21 Jan 2015 21:37:38 +0000 Subject: [PATCH] daemon: Do some session cleanup if an error occurs when importing an XML scenario. --- trunk/daemon/sbin/core-daemon | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/trunk/daemon/sbin/core-daemon b/trunk/daemon/sbin/core-daemon index 42298949..68113f7c 100755 --- a/trunk/daemon/sbin/core-daemon +++ b/trunk/daemon/sbin/core-daemon @@ -935,7 +935,12 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler): filename = sys.argv[0] if os.path.splitext(filename)[1].lower() == '.xml': session = server.getsession(useexisting=False) - opensessionxml(session, filename, start=True) + try: + opensessionxml(session, filename, start=True) + except: + session.shutdown() + server.delsession(session) + raise else: t = threading.Thread(target = execfile, args=(filename, {'__file__': filename,