Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-06-08 15:16:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[daemon] WIP: use callbacks to work with daemon

Browse source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2022-06-08 19:35:23 +03:00
parent 463d43b0bb
commit 78193fc8f8
No known key found for this signature in database
GPG key ID: 66F6C87B98EBCFE2
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libi2pd_webconsole/HTTPServer.cpp
View file

@ -27,15 +27,18 @@
#include "RouterContext.h"
#include "ClientContext.h"
#include "HTTPServer.h"
#include "Daemon.h"
#include "util.h"
#include "ECIESX25519AEADRatchetSession.h"
#include "I18N.h"
#ifdef WIN32_APP
#include "Daemon.h"
#include "Win32App.h"
#endif
// Inja template engine
#include "inja/inja.hpp"
// For image, style and info
#include "version.h"
#include "HTTPServerResources.h"
@ -270,8 +273,10 @@ namespace http {
ShowNetworkStatus (s, i2p::context.GetStatusV6 ());
s << "<br>\r\n";
}
// TODO: rewrite timer access
#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
if (auto remains = Daemon.gracefulShutdownInterval) {
if (auto remains = m_DaemonGracefulTimer) {
s << "<b>" << tr("Stopping in") << ":</b> ";
ShowUptime(s, remains);
s << "<br>\r\n";
@ -1240,8 +1245,9 @@ namespace http {
else if (cmd == HTTP_COMMAND_SHUTDOWN_START)
{
i2p::context.SetAcceptsTunnels (false);
// TODO: rewrite timer access
#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
Daemon.gracefulShutdownInterval = 10*60;
if (m_DaemonGracefulTimer) m_DaemonGracefulTimer = 10 * 60;
#elif defined(WIN32_APP)
i2p::win32::GracefulShutdown ();
#endif
@ -1249,16 +1255,18 @@ namespace http {
else if (cmd == HTTP_COMMAND_SHUTDOWN_CANCEL)
{
i2p::context.SetAcceptsTunnels (true);
// TODO: rewrite timer access
#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
Daemon.gracefulShutdownInterval = 0;
if (m_DaemonGracefulTimer) m_DaemonGracefulTimer = 0;
#elif defined(WIN32_APP)
i2p::win32::StopGracefulShutdown ();
#endif
}
else if (cmd == HTTP_COMMAND_SHUTDOWN_NOW)
{
// TODO: rewrite stop command access
#ifndef WIN32_APP
Daemon.running = false;
if (m_DaemonStop) m_DaemonStop();
#else
i2p::win32::StopWin32App ();
#endif