[trafficserver] branch master updated: Don't Alert and immediate shutdown during a normal shutdown.

[sh...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ab7f977  Don't Alert and immediate shutdown during a normal shutdown.
ab7f977 is described below

commit ab7f97736b267228257ffa9e9056b2e244e985c7
Author: Susan Hinrichs <sh...@oath.com>
AuthorDate: Fri Feb 1 23:30:08 2019 +0000

    Don't Alert and immediate shutdown during a normal shutdown.
---
 mgmt/ProcessManager.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index d5932be..4f52c9e 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -164,13 +164,13 @@ ProcessManager::processManagerThread(void *arg)
 
     if (pmgmt->require_lm) {
       ret = pmgmt->pollLMConnection();
-      if (ret < 0 && pmgmt->running) {
+      if (ret < 0 && pmgmt->running && !shutdown_event_system) {
         Alert("exiting with read error from process manager: %s", strerror(-ret));
       }
     }
 
     ret = pmgmt->processSignalQueue();
-    if (ret < 0 && pmgmt->running) {
+    if (ret < 0 && pmgmt->running && !shutdown_event_system) {
       Alert("exiting with write error from process manager: %s", strerror(-ret));
     }
   }