mirror of
https://github.com/oxen-io/oxen-mq.git
synced 2023-12-13 21:00:31 +01:00
3b86eb1341
This replaces the recognition of SN status to be checked per-command invocation rather than on connection. As this breaks the API quite substantially, though doesn't really affect the functionality, it seems suitable to bump the minor version. This requires a fundamental shift in how the calling application tells LokiMQ about service nodes: rather than using a callback invoked on connection, the application now has to call set_active_sns() (or the more efficient update_active_sns(), if changes are readily available) to update the list whenever it changes. LokiMQ then keeps this list internally and uses it when determining whether to invoke. This release also brings better request responses on errors: when a request fails, the data argument will now be set to the failure reason, one of: - TIMEOUT - UNKNOWNCOMMAND - NOT_A_SERVICE_NODE (the remote isn't running in SN mode) - FORBIDDEN (auth level denies the request) - FORBIDDEN_SN (SN required and the remote doesn't see us as a SN) Some of these (UNKNOWNCOMMAND, NOT_A_SERVICE_NODE, FORBIDDEN) were already sent by remotes, but there was no connection to a request and so they would log a warning, but the request would have to time out. These errors (minus TIMEOUT, plus NO_REPLY_TAG signalling that a command is a request but didn't include a reply tag) are also sent in response to regular commands, but they simply result in a log warning showing the error type and the command that caused the failure when received.
52 lines
1.6 KiB
C++
52 lines
1.6 KiB
C++
#pragma once
|
|
#include "lokimq/lokimq.h"
|
|
#include <catch2/catch.hpp>
|
|
|
|
using namespace lokimq;
|
|
|
|
static auto startup = std::chrono::steady_clock::now();
|
|
|
|
/// Waits up to 100ms for something to happen.
|
|
template <typename Func>
|
|
inline void wait_for(Func f) {
|
|
for (int i = 0; i < 10; i++) {
|
|
if (f())
|
|
break;
|
|
std::this_thread::sleep_for(10ms);
|
|
}
|
|
}
|
|
|
|
/// Waits on an atomic bool for up to 100ms for an initial connection, which is more than enough
|
|
/// time for an initial connection + request.
|
|
inline void wait_for_conn(std::atomic<bool> &c) {
|
|
wait_for([&c] { return c.load(); });
|
|
}
|
|
|
|
/// Waits enough time for us to receive a reply from a localhost remote.
|
|
inline void reply_sleep() { std::this_thread::sleep_for(10ms); }
|
|
|
|
// Catch2 macros aren't thread safe, so guard with a mutex
|
|
inline std::unique_lock<std::mutex> catch_lock() {
|
|
static std::mutex mutex;
|
|
return std::unique_lock<std::mutex>{mutex};
|
|
}
|
|
|
|
inline LokiMQ::Logger get_logger(std::string prefix = "") {
|
|
std::string me = "tests/common.h";
|
|
std::string strip = __FILE__;
|
|
if (strip.substr(strip.size() - me.size()) == me)
|
|
strip.resize(strip.size() - me.size());
|
|
else
|
|
strip.clear();
|
|
|
|
return [prefix,strip](LogLevel lvl, std::string file, int line, std::string msg) {
|
|
if (!strip.empty() && file.substr(0, strip.size()) == strip)
|
|
file = file.substr(strip.size());
|
|
|
|
auto lock = catch_lock();
|
|
UNSCOPED_INFO(prefix << "[" << file << ":" << line << "/"
|
|
"+" << std::chrono::duration<double>(std::chrono::steady_clock::now() - startup).count() << "s]: "
|
|
<< lvl << ": " << msg);
|
|
};
|
|
}
|