Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop socket listener when terminating by SIGTERM" into rvc-dev am: 386cdc2c44

Browse Source 
Change-Id: Id78f130c08c58e5a0fb5500f4b7cb3cd56dd6507
This commit is contained in:
TreeHugger Robot
2020-04-21 00:07:30 +00:00
committed by Automerger Merge Worker
parent 20a9c79b34 386cdc2c44
commit 5863643d83
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/statsd/src/main.cpp
View File

@@ -37,6 +37,7 @@ using std::shared_ptr;
using std::make_shared;
shared_ptr<StatsService> gStatsService = nullptr;
sp<StatsSocketListener> gSocketListener = nullptr;
void signalHandler(int sig) {
if (sig == SIGPIPE) {
@@ -47,6 +48,7 @@ void signalHandler(int sig) {
return;
}
if (gSocketListener != nullptr) gSocketListener->stopListener();
if (gStatsService != nullptr) gStatsService->Terminate();
ALOGW("statsd terminated on receiving signal %d.", sig);
exit(1);
@@ -92,11 +94,11 @@ int main(int /*argc*/, char** /*argv*/) {
gStatsService->Startup();
sp<StatsSocketListener> socketListener = new StatsSocketListener(eventQueue);
gSocketListener = new StatsSocketListener(eventQueue);
ALOGI("Statsd starts to listen to socket.");
// Backlog and /proc/sys/net/unix/max_dgram_qlen set to large value
if (socketListener->startListener(600)) {
if (gSocketListener->startListener(600)) {
exit(1);
}