common Daemon.GetGracefulShutdownInterval

Win32/DaemonWin32.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2023, The PurpleI2P Project
+* Copyright (c) 2013-2025, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -98,6 +98,11 @@ namespace util
 		}
 #endif
 	}
+
+	int DaemonWin32::GetGracefulShutdownInterval () const
+	{
+		return i2p::win32::GetGracefulShutdownRemainingTime ();
+	}	
 }
 }
 #endif //_WIN32

Win32/Win32App.cpp

@@ -195,7 +195,7 @@ namespace win32
 		s << "; ";
 		s << "Success Rate: " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate() << "%\n";
 		s << "Uptime: "; ShowUptime(s, i2p::context.GetUptime ());
-		auto gracefulTimeLeft = GetGracefulShutdownRemainingTime ();
+		auto gracefulTimeLeft = Daemon.GetGracefulShutdownInterval ();
 		if (gracefulTimeLeft > 0)
 		{	
 			s << "Graceful shutdown, time left: "; ShowUptime(s, gracefulTimeLeft);

daemon/Daemon.h

@@ -29,7 +29,10 @@ namespace util
 		virtual void run () {};
 
 		virtual void setDataDir (std::string path);
-
+		virtual int GetGracefulShutdownInterval () const { return 0; };
+		
+	public:
+		
 		bool isDaemon;
 		bool running;
 
@@ -74,15 +77,21 @@ namespace util
 				static DaemonWin32 instance;
 				return instance;
 			}
-
+	
 			bool init(int argc, char* argv[]);
 			bool start();
 			bool stop();
 			void run ();
 
+			int GetGracefulShutdownInterval () const;
+
+		public:
+		
 			bool isGraceful;
 
-			DaemonWin32 ():isGraceful(false) {}
+		private:
+
+			DaemonWin32 (): isGraceful(false) {}
 	};
 #elif (defined(ANDROID) && !defined(ANDROID_BINARY))
 #define Daemon i2p::util::DaemonAndroid::Instance()
@@ -112,6 +121,8 @@ namespace util
 			bool stop();
 			void run ();
 
+			int GetGracefulShutdownInterval () const { return gracefulShutdownInterval; };
+			
 		private:
 
 			std::string pidfile;

daemon/HTTPServer.cpp

@@ -300,21 +300,13 @@ namespace http {
 			ShowNetworkStatus (s, i2p::context.GetStatusV6 (), i2p::context.GetTestingV6(), i2p::context.GetErrorV6 ());
 			s << "<br>\r\n";
 		}
-#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
+		auto remains = Daemon.GetGracefulShutdownInterval ();
-		if (auto remains = Daemon.gracefulShutdownInterval) {
-			s << "<b>" << tr("Stopping in") << ":</b> ";
-			ShowUptime(s, remains);
-			s << "<br>\r\n";
-		}
-#elif defined(WIN32_APP)
-		auto remains = i2p::win32::GetGracefulShutdownRemainingTime ();
 		if (remains > 0) 
 		{
 			s << "<b>" << tr("Stopping in") << ":</b> ";
 			ShowUptime(s, remains);
 			s << "<br>\r\n";
 		}
-#endif
 		auto family = i2p::context.GetFamily ();
 		if (family.length () > 0)
 			s << "<b>"<< tr("Family") << ":</b> " << family << "<br>\r\n";