Add a Server::isRunning to know if the server is running or not.

kiwix · Oct 7, 2022 · 2130b1a · 2130b1a
1 parent 064a604
commit 2130b1a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/include/server.h b/include/server.h
@@ -118,6 +118,11 @@ namespace kiwix
         */
        void stop();
 
+       /**
+        * Tell if the server is running or not.
+        */
+       bool isRunning();
+
        int getPort();
        std::string getAddress();
 

diff --git a/src/server.cpp b/src/server.cpp
@@ -61,6 +61,13 @@ void Server::stop() {
   }
 }
 
+bool Server::isRunning() {
+  if (!mp_server) {
+    return false;
+  }
+  return mp_server->isRunning();
+}
+
 int Server::getPort()
 {
   return mp_server->getPort();

diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
@@ -415,8 +415,13 @@ bool InternalServer::start() {
 void InternalServer::stop()
 {
   MHD_stop_daemon(mp_daemon);
+  mp_daemon = nullptr;
 }
 
+bool InternalServer::isRunning() const
+{
+  return mp_daemon != nullptr;
+}
 static MHD_Result staticHandlerCallback(void* cls,
                                         struct MHD_Connection* connection,
                                         const char* url,

diff --git a/src/server/internalServer.h b/src/server/internalServer.h
@@ -107,6 +107,7 @@ class InternalServer {
                                void** cont_cls);
     bool start();
     void stop();
+    bool isRunning() const;
     std::string getAddress() { return m_addr; }
     int getPort() { return m_configuration.m_port; }