Merge branch 'vpn-api-2019-10-03' of ssh://github.com/majestrate/loki-network into vpn-api-2019-10-03

This commit is contained in:
Jeff Becker 2019-10-09 09:25:45 -04:00
commit 51a2f04e5f
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

View File

@ -242,7 +242,7 @@ __ ___ ____ _ _ ___ _ _ ____
llarp_ev_loop_run_single_process(mainloop, logic);
if(closeWaiter)
{
// inform promise if called by Stop
// inform promise if called by CloseAsync
closeWaiter->set_value();
}
return 0;
@ -254,7 +254,7 @@ __ ___ ____ _ _ ___ _ _ ____
/// already closing
if(closeWaiter)
return;
if(CallSafe(std::bind(&Context::HandleSignal, this, SIGINT)))
if(CallSafe(std::bind(&Context::HandleSignal, this, SIGTERM)))
closeWaiter = std::make_unique< std::promise< void > >();
}