Better handle plugin exceptions.
parent
08193a4580
commit
6904a893b7
|
@ -168,7 +168,9 @@ class WorkerThread(threading.Thread):
|
||||||
if logLine.startswith('Model error('):
|
if logLine.startswith('Model error('):
|
||||||
gcodefile.write(';%s\n' % (logLine))
|
gcodefile.write(';%s\n' % (logLine))
|
||||||
gcodefile.close()
|
gcodefile.close()
|
||||||
profile.runPostProcessingPlugins(gcodeFilename)
|
ret = profile.runPostProcessingPlugins(gcodeFilename)
|
||||||
|
if ret != None:
|
||||||
|
self.progressLog.append(ret)
|
||||||
self.gcode = gcodeInterpreter.gcode()
|
self.gcode = gcodeInterpreter.gcode()
|
||||||
self.gcode.load(gcodeFilename)
|
self.gcode.load(gcodeFilename)
|
||||||
profile.replaceGCodeTags(gcodeFilename, self.gcode)
|
profile.replaceGCodeTags(gcodeFilename, self.gcode)
|
||||||
|
|
|
@ -612,7 +612,12 @@ def runPostProcessingPlugins(gcodefilename):
|
||||||
try:
|
try:
|
||||||
value = float(value)
|
value = float(value)
|
||||||
except:
|
except:
|
||||||
value = 0.0
|
value = float(param['default'])
|
||||||
|
|
||||||
locals[param['name']] = value
|
locals[param['name']] = value
|
||||||
execfile(pythonFile, locals)
|
try:
|
||||||
|
execfile(pythonFile, locals)
|
||||||
|
except:
|
||||||
|
locationInfo = traceback.extract_tb(sys.exc_info()[2])[-1]
|
||||||
|
return "%s: '%s' @ %s:%s:%d" % (str(sys.exc_info()[0].__name__), str(sys.exc_info()[1]), os.path.basename(locationInfo[0]), locationInfo[2], locationInfo[1])
|
||||||
|
return None
|
||||||
|
|
Loading…
Reference in New Issue