Merge "Fix oslo.service ProcessLauncher fails to call stop" into stable/ocata

2019-05-20 09:03:49 +00:00 · 2019-05-20 09:03:49 +00:00 · 595c40b2ba
parent 45fbdc516f 7db3f68721
commit 595c40b2ba
1 changed files with 2 additions and 0 deletions
--- a/oslo_service/service.py
+++ b/oslo_service/service.py
@ -457,8 +457,10 @@ class ProcessLauncher(object):
            status = exc.code
            signo = exc.signo
        except SystemExit as exc:
+            launcher.stop()
            status = exc.code
        except BaseException:
+            launcher.stop()
            LOG.exception(_LE('Unhandled exception'))
            status = 2