Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc0bae26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I3cca40fa481ce2183876c23aa1fcc710837e7341
parents 320b102a c43f0e5d

cmds/statsd/src/main.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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);

    }