[pulsar] branch master updated: Fix logging in shutdown (#15626)

[zhangmingao]

This is an automated email from the ASF dual-hosted git repository.

zhangmingao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 21a1fb66f60 Fix logging in shutdown (#15626)
21a1fb66f60 is described below

commit 21a1fb66f603bd99ad761f9eda4e565584fe5ebd
Author: lixinyang <84127069+nicklee...@users.noreply.github.com>
AuthorDate: Thu May 19 16:13:02 2022 +0800

    Fix logging in shutdown (#15626)
    
    Co-authored-by: nicklixinyang <nicklixiny...@didiglobal.com>
---
 .../src/main/java/org/apache/pulsar/PulsarBrokerStarter.java          | 2 ++
 .../src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java 
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
index 9debacddf7f..cac23d5166d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
@@ -338,6 +338,8 @@ public class PulsarBrokerStarter {
                     starter.shutdown();
                 } catch (Throwable t) {
                     log.error("Error while shutting down Pulsar service", t);
+                } finally {
+                    LogManager.shutdown();
                 }
             }, "pulsar-service-shutdown")
         );
diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java 
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
index 8bd2a408b30..7b55721b8c4 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
@@ -123,10 +123,10 @@ public class PulsarStandaloneStarter extends 
PulsarStandalone {
                 if (bkEnsemble != null) {
                     bkEnsemble.stop();
                 }
-
-                LogManager.shutdown();
             } catch (Exception e) {
                 log.error("Shutdown failed: {}", e.getMessage(), e);
+            } finally {
+                LogManager.shutdown();
             }
         }));
     }