From 4326effee17c8f8125e63cacfc22cad694842b3e Mon Sep 17 00:00:00 2001
From: Eric Jeong <ericjeong@google.com>
Date: Thu, 3 Oct 2019 13:33:48 -0700
Subject: Terminate statsd on a few signals including SIGTERM

- statsd is handling SIGHUP/SIGQUIT/SIGINT/SIGTERM, but doesn't exit.
- The expected behaviour is that statsd would exit after finalizing log
processing when those signals are received.

Bug: 139817664
Test: Send SIGTERM to statsd and check if it is terminated. (note that
init will revive statsd)

Change-Id: Id1146d772f8c68892256ee7a3eea70837fee5c7a
(cherry picked from commit 2d99718adf13eb116207abd25d05676dd2a691db)
(cherry picked from commit 931811bda4e52ba74dd17121b514615f2991583f)
Merged-In: Id1146d772f8c68892256ee7a3eea70837fee5c7a
---
 cmds/statsd/src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmds/statsd/src/main.cpp b/cmds/statsd/src/main.cpp
index 42132ee0daae..7d446a9a1ed6 100644
--- a/cmds/statsd/src/main.cpp
+++ b/cmds/statsd/src/main.cpp
@@ -53,6 +53,8 @@ void sigHandler(int sig) {
     if (gStatsService != nullptr) {
         gStatsService->Terminate();
     }
+    ALOGW("statsd terminated on receiving signal %d.", sig);
+    exit(1);
 }
 
 void registerSigHandler()
-- 
cgit v1.2.3-59-g8ed1b