add value error handling
This commit is contained in:
parent
f7f438e767
commit
1ce98ace33
|
@ -95,6 +95,8 @@ class DevicePoolExecutor:
|
||||||
f.write(str(job) + "\n\n")
|
f.write(str(job) + "\n\n")
|
||||||
except Empty:
|
except Empty:
|
||||||
pass
|
pass
|
||||||
|
except ValueError:
|
||||||
|
break
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
logger.error("error in log worker: %s", err)
|
logger.error("error in log worker: %s", err)
|
||||||
|
|
||||||
|
@ -119,6 +121,8 @@ class DevicePoolExecutor:
|
||||||
self.context[device].set_cancel()
|
self.context[device].set_cancel()
|
||||||
except Empty:
|
except Empty:
|
||||||
pass
|
pass
|
||||||
|
except ValueError:
|
||||||
|
break
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
logger.error("error in progress worker: %s", err)
|
logger.error("error in progress worker: %s", err)
|
||||||
|
|
||||||
|
@ -141,6 +145,8 @@ class DevicePoolExecutor:
|
||||||
del self.active_jobs[job]
|
del self.active_jobs[job]
|
||||||
except Empty:
|
except Empty:
|
||||||
pass
|
pass
|
||||||
|
except ValueError:
|
||||||
|
break
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
logger.error("error in finished worker: %s", err)
|
logger.error("error in finished worker: %s", err)
|
||||||
|
|
||||||
|
@ -219,6 +225,7 @@ class DevicePoolExecutor:
|
||||||
if worker.is_alive():
|
if worker.is_alive():
|
||||||
logger.debug("stopping worker for device %s", device)
|
logger.debug("stopping worker for device %s", device)
|
||||||
worker.join(self.join_timeout)
|
worker.join(self.join_timeout)
|
||||||
|
worker.terminate()
|
||||||
else:
|
else:
|
||||||
logger.debug("worker for device %s has died", device)
|
logger.debug("worker for device %s has died", device)
|
||||||
|
|
||||||
|
|
|
@ -29,11 +29,16 @@ def worker_main(context: WorkerContext, server: ServerContext):
|
||||||
logger.info("starting job: %s", name)
|
logger.info("starting job: %s", name)
|
||||||
fn(context, *args, **kwargs)
|
fn(context, *args, **kwargs)
|
||||||
logger.info("job succeeded: %s", name)
|
logger.info("job succeeded: %s", name)
|
||||||
|
context.pending.task_done()
|
||||||
context.set_finished()
|
context.set_finished()
|
||||||
except Empty:
|
except Empty:
|
||||||
pass
|
pass
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
|
logger.info("worker got keyboard interrupt")
|
||||||
exit(0)
|
exit(0)
|
||||||
|
except ValueError as e:
|
||||||
|
logger.info("value error in worker: %s", e)
|
||||||
|
exit(1)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(
|
logger.error(
|
||||||
"error while running job: %s",
|
"error while running job: %s",
|
||||||
|
|
Loading…
Reference in New Issue