some cleanup

This commit is contained in:
= 2025-04-28 13:05:40 +02:00 committed by Quentin Dawans
parent aad8bde477
commit 417da2ecbc
3 changed files with 4 additions and 8 deletions

View File

@ -1,4 +1,4 @@
#ifndef __SYSTEMD_H__
#ifndef __SYSTEMD_H__
#define __SYSTEMD_H__
#cmakedefine ACORE_WITH_SYSTEMD
#cmakedefine WITH_SYSTEMD
#endif // __SYSTEMD_H__

View File

@ -36,11 +36,9 @@ target_link_libraries(shared
PUBLIC
database)
set(ACORE_WITH_SYSTEMD OFF)
find_library(WITH_SYSTEMD systemd)
if(WITH_SYSTEMD)
message("*** Building with SYSTEMD support")
set(ACORE_WITH_SYSTEMD ON)
target_link_libraries(shared PUBLIC systemd)
else(LINUX)
message("*** Skipping SYSTEMD support")

View File

@ -25,7 +25,7 @@
#include <boost/asio/ip/tcp.hpp>
#include <functional>
#ifdef ACORE_WITH_SYSTEMD
#ifdef WITH_SYSTEMD
#include <systemd/sd-daemon.h>
#endif
@ -43,7 +43,7 @@ public:
_socket(ioContext), _closed(false), _socketFactory([this](){ return DefaultSocketFactory(); }),
_supportSocketActivation(supportSocketActivation)
{
#ifdef ACORE_WITH_SYSTEMD
#ifdef WITH_SYSTEMD
if (_supportSocketActivation && sd_listen_fds(0) > 0)
{
LOG_DEBUG("network", "Using socket from systemd socket activation");
@ -53,7 +53,6 @@ public:
{
LOG_WARN("network", "Failed to assign socket {}", errorCode.message());
}
_shouldBind = false;
}
#endif
}
@ -147,7 +146,6 @@ private:
tcp::socket _socket;
std::atomic<bool> _closed;
std::function<std::pair<tcp::socket*, uint32>()> _socketFactory;
bool _shouldBind = true;
bool _supportSocketActivation = false;
};