"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/remote/apilistener.hpp" between
icinga2-2.11.5.tar.gz and icinga2-2.12.0.tar.gz

About: Icinga 2 is an enterprise grade monitoring system which keeps watch over networks and any conceivable network resource.

apilistener.hpp  (icinga2-2.11.5):apilistener.hpp  (icinga2-2.12.0)
skipping to change at line 20 skipping to change at line 20
#include "remote/messageorigin.hpp" #include "remote/messageorigin.hpp"
#include "base/configobject.hpp" #include "base/configobject.hpp"
#include "base/process.hpp" #include "base/process.hpp"
#include "base/shared.hpp" #include "base/shared.hpp"
#include "base/timer.hpp" #include "base/timer.hpp"
#include "base/workqueue.hpp" #include "base/workqueue.hpp"
#include "base/tcpsocket.hpp" #include "base/tcpsocket.hpp"
#include "base/tlsstream.hpp" #include "base/tlsstream.hpp"
#include "base/threadpool.hpp" #include "base/threadpool.hpp"
#include <atomic> #include <atomic>
#include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/ssl/context.hpp> #include <boost/asio/ssl/context.hpp>
#include <set> #include <set>
namespace icinga namespace icinga
{ {
class JsonRpcConnection; class JsonRpcConnection;
skipping to change at line 129 skipping to change at line 130
protected: protected:
void OnConfigLoaded() override; void OnConfigLoaded() override;
void OnAllConfigLoaded() override; void OnAllConfigLoaded() override;
void Start(bool runtimeCreated) override; void Start(bool runtimeCreated) override;
void Stop(bool runtimeDeleted) override; void Stop(bool runtimeDeleted) override;
void ValidateTlsProtocolmin(const Lazy<String>& lvalue, const ValidationU tils& utils) override; void ValidateTlsProtocolmin(const Lazy<String>& lvalue, const ValidationU tils& utils) override;
void ValidateTlsHandshakeTimeout(const Lazy<double>& lvalue, const Valida tionUtils& utils) override; void ValidateTlsHandshakeTimeout(const Lazy<double>& lvalue, const Valida tionUtils& utils) override;
private: private:
std::shared_ptr<boost::asio::ssl::context> m_SSLContext; Shared<boost::asio::ssl::context>::Ptr m_SSLContext;
mutable boost::mutex m_AnonymousClientsLock; mutable boost::mutex m_AnonymousClientsLock;
mutable boost::mutex m_HttpClientsLock; mutable boost::mutex m_HttpClientsLock;
std::set<JsonRpcConnection::Ptr> m_AnonymousClients; std::set<JsonRpcConnection::Ptr> m_AnonymousClients;
std::set<HttpServerConnection::Ptr> m_HttpClients; std::set<HttpServerConnection::Ptr> m_HttpClients;
Timer::Ptr m_Timer; Timer::Ptr m_Timer;
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;
Timer::Ptr m_AuthorityTimer; Timer::Ptr m_AuthorityTimer;
Timer::Ptr m_CleanupCertificateRequestsTimer; Timer::Ptr m_CleanupCertificateRequestsTimer;
skipping to change at line 155 skipping to change at line 156
static std::atomic<bool> m_UpdatedObjectAuthority; static std::atomic<bool> m_UpdatedObjectAuthority;
void ApiTimerHandler(); void ApiTimerHandler();
void ApiReconnectTimerHandler(); void ApiReconnectTimerHandler();
void CleanupCertificateRequestsTimerHandler(); void CleanupCertificateRequestsTimerHandler();
void CheckApiPackageIntegrity(); void CheckApiPackageIntegrity();
bool AddListener(const String& node, const String& service); bool AddListener(const String& node, const String& service);
void AddConnection(const Endpoint::Ptr& endpoint); void AddConnection(const Endpoint::Ptr& endpoint);
void NewClientHandler(boost::asio::yield_context yc, const std::shared_pt void NewClientHandler(
r<AsioTlsStream>& client, const String& hostname, ConnectionRole role); boost::asio::yield_context yc, const Shared<boost::asio::io_conte
void NewClientHandlerInternal(boost::asio::yield_context yc, const std::s xt::strand>::Ptr& strand,
hared_ptr<AsioTlsStream>& client, const String& hostname, ConnectionRole role); const Shared<AsioTlsStream>::Ptr& client, const String& hostname,
void ListenerCoroutineProc(boost::asio::yield_context yc, const std::shar ConnectionRole role
ed_ptr<boost::asio::ip::tcp::acceptor>& server, const std::shared_ptr<boost::asi );
o::ssl::context>& sslContext); void NewClientHandlerInternal(
boost::asio::yield_context yc, const Shared<boost::asio::io_conte
xt::strand>::Ptr& strand,
const Shared<AsioTlsStream>::Ptr& client, const String& hostname,
ConnectionRole role
);
void ListenerCoroutineProc(boost::asio::yield_context yc, const Shared<bo
ost::asio::ip::tcp::acceptor>::Ptr& server, const Shared<boost::asio::ssl::conte
xt>::Ptr& sslContext);
WorkQueue m_RelayQueue; WorkQueue m_RelayQueue;
WorkQueue m_SyncQueue{0, 4}; WorkQueue m_SyncQueue{0, 4};
boost::mutex m_LogLock; boost::mutex m_LogLock;
Stream::Ptr m_LogFile; Stream::Ptr m_LogFile;
size_t m_LogMessageCount{0}; size_t m_LogMessageCount{0};
bool RelayMessageOne(const Zone::Ptr& zone, const MessageOrigin::Ptr& ori gin, const Dictionary::Ptr& message, const Endpoint::Ptr& currentZoneMaster); bool RelayMessageOne(const Zone::Ptr& zone, const MessageOrigin::Ptr& ori gin, const Dictionary::Ptr& message, const Endpoint::Ptr& currentZoneMaster);
void SyncRelayMessage(const MessageOrigin::Ptr& origin, const ConfigObjec t::Ptr& secobj, const Dictionary::Ptr& message, bool log); void SyncRelayMessage(const MessageOrigin::Ptr& origin, const ConfigObjec t::Ptr& secobj, const Dictionary::Ptr& message, bool log);
 End of changes. 3 change blocks. 
8 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)