diff --git a/Daemon.h b/Daemon.h index 85b31240..2bc05462 100644 --- a/Daemon.h +++ b/Daemon.h @@ -97,7 +97,7 @@ namespace i2p public: - int gracefullShutdownInterval; // in seconds + int gracefulShutdownInterval; // in seconds }; #endif diff --git a/DaemonLinux.cpp b/DaemonLinux.cpp index 87e50a72..7d791bf2 100644 --- a/DaemonLinux.cpp +++ b/DaemonLinux.cpp @@ -25,11 +25,11 @@ void handle_signal(int sig) i2p::client::context.ReloadConfig(); break; case SIGINT: - if (i2p::context.AcceptsTunnels () && !Daemon.gracefullShutdownInterval) + if (i2p::context.AcceptsTunnels () && !Daemon.gracefulShutdownInterval) { i2p::context.SetAcceptsTunnels (false); - Daemon.gracefullShutdownInterval = 10*60; // 10 minutes - LogPrint(eLogInfo, "Graceful shutdown after ", Daemon.gracefullShutdownInterval, " seconds"); + Daemon.gracefulShutdownInterval = 10*60; // 10 minutes + LogPrint(eLogInfo, "Graceful shutdown after ", Daemon.gracefulShutdownInterval, " seconds"); } else Daemon.running = 0; @@ -110,7 +110,7 @@ namespace i2p return false; } } - gracefullShutdownInterval = 0; // not specified + gracefulShutdownInterval = 0; // not specified // Signal handler struct sigaction sa; @@ -137,10 +137,10 @@ namespace i2p while (running) { std::this_thread::sleep_for (std::chrono::seconds(1)); - if (gracefullShutdownInterval) + if (gracefulShutdownInterval) { - gracefullShutdownInterval--; // - 1 second - if (gracefullShutdownInterval <= 0) + gracefulShutdownInterval--; // - 1 second + if (gracefulShutdownInterval <= 0) { LogPrint(eLogInfo, "Graceful shutdown"); return; diff --git a/HTTPServer.cpp b/HTTPServer.cpp index 487e9c83..890daf9e 100644 --- a/HTTPServer.cpp +++ b/HTTPServer.cpp @@ -196,7 +196,7 @@ namespace http { } s << "
\r\n"; #if (!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) - if (auto remains = Daemon.gracefullShutdownInterval) { + if (auto remains = Daemon.gracefulShutdownInterval) { s << "Stopping in: "; s << remains << " seconds"; s << "
\r\n"; @@ -416,13 +416,13 @@ namespace http { else s << " Accept transit tunnels
\r\n"; #if (!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) - if (Daemon.gracefullShutdownInterval) - s << " Cancel gracefull shutdown
"; + if (Daemon.gracefulShutdownInterval) + s << " Cancel graceful shutdown
"; else - s << " Start gracefull shutdown
\r\n"; + s << " Start graceful shutdown
\r\n"; #endif #ifdef WIN32_APP - s << " Gracefull shutdown
\r\n"; + s << " Graceful shutdown
\r\n"; #endif s << " Force shutdown
\r\n"; } @@ -755,7 +755,7 @@ namespace http { else if (cmd == HTTP_COMMAND_SHUTDOWN_START) { i2p::context.SetAcceptsTunnels (false); #if (!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) - Daemon.gracefullShutdownInterval = 10*60; + Daemon.gracefulShutdownInterval = 10*60; #endif #ifdef WIN32_APP i2p::win32::GracefulShutdown (); @@ -763,7 +763,7 @@ namespace http { } else if (cmd == HTTP_COMMAND_SHUTDOWN_CANCEL) { i2p::context.SetAcceptsTunnels (true); #if (!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) - Daemon.gracefullShutdownInterval = 0; + Daemon.gracefulShutdownInterval = 0; #endif } else if (cmd == HTTP_COMMAND_SHUTDOWN_NOW) { Daemon.running = false;