Merge "Fix oslo.service ProcessLauncher fails to call stop"

2018-07-23 16:59:34 +00:00 · 2018-07-23 16:59:34 +00:00 · 62d4119dac
parent 274aac47b7 612c6507dc
commit 62d4119dac
1 changed files with 2 additions and 0 deletions
--- a/oslo_service/service.py
+++ b/oslo_service/service.py
@ -520,8 +520,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('Unhandled exception')
            status = 2