Capture Ctrl+C in cli_wallet when not in daemon mode #1193

bitshares · Oct 19, 2018 · ad21932 · ad21932
1 parent 05ea454
commit ad21932
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/libraries/fc b/libraries/fc
diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp
@@ -61,12 +61,6 @@
 # include <csignal>
 #endif
 
-#ifdef WIN32
-   #define QUIT_CURR_THREAD TerminateThread(pthread_self(), 0)
-#else
-   #define QUIT_CURR_THREAD pthread_cancel(pthread_self())
-#endif
-
 using namespace graphene::app;
 using namespace graphene::chain;
 using namespace graphene::utilities;
@@ -286,16 +280,16 @@ int main( int argc, char** argv )
          wallet_cli->register_api( wapi );
          wallet_cli->start();
 
-         fc::set_signal_handler([&wapi, &wallet_file](int signal) {
+         fc::set_signal_handler([&wallet_cli, &wapi, &wallet_file](int signal) {
             ilog( "Captured SIGINT not in daemon mode" );
             wapi->save_wallet_file(wallet_file.generic_string());
-            QUIT_CURR_THREAD;
+            wallet_cli->quit_blocked_thread();
          }, SIGINT);
 
-         fc::set_signal_handler([&wapi, &wallet_file](int signal) {
+         fc::set_signal_handler([&wallet_cli, &wapi, &wallet_file](int signal) {
             ilog( "Captured SIGTERM not in daemon mode" );
             wapi->save_wallet_file(wallet_file.generic_string());
-            QUIT_CURR_THREAD;
+            wallet_cli->quit_blocked_thread();
          }, SIGTERM);
 
          wallet_cli->wait();
@@ -307,6 +301,10 @@ int main( int argc, char** argv )
            exit_promise->set_value(signal);
         }, SIGINT);
 
+        fc::set_signal_handler([&exit_promise](int signal) {
+           exit_promise->set_value(signal);
+        }, SIGTERM);
+
         ilog( "Entering Daemon Mode, ^C to exit" );
         exit_promise->wait();
       }
+8 −8		include/fc/container/flat.hpp
+4 −4		include/fc/container/flat_fwd.hpp
+4 −4		include/fc/variant.hpp