From af82db7e4314aca7930eb23da9fa13f664fe2072 Mon Sep 17 00:00:00 2001
From: "jun923.gu" <gujun1989@126.com>
Date: Tue, 19 Jun 2018 10:25:07 +0800
Subject: [PATCH] Fix oslo.service ProcessLauncher fails to call stop

Change-Id: Ie8fd5f1da991f9b7edf43dbe15ad088599fef053
Closes-Bug: #1773070
(cherry picked from commit 612c6507dc226f99d95bd22e1b68548b40275f21)
---
 oslo_service/service.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/oslo_service/service.py b/oslo_service/service.py
index e7c8e859..4ef02077 100644
--- a/oslo_service/service.py
+++ b/oslo_service/service.py
@@ -456,8 +456,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