mirror of
https://github.com/oxen-io/oxen-mq.git
synced 2023-12-13 21:00:31 +01:00
Rename keep-alive -> keep_alive in internal serialization
This makes it consistent with other internal parameter names.
This commit is contained in:
parent
48d3f261d3
commit
b97f3442e7
4 changed files with 4 additions and 4 deletions
|
@ -128,7 +128,7 @@ std::pair<zmq::socket_t *, std::string> LokiMQ::proxy_connect_sn(bt_dict_consume
|
||||||
hint = data.consume_string();
|
hint = data.consume_string();
|
||||||
if (data.skip_until("incoming"))
|
if (data.skip_until("incoming"))
|
||||||
incoming_only = data.consume_integer<bool>();
|
incoming_only = data.consume_integer<bool>();
|
||||||
if (data.skip_until("keep-alive"))
|
if (data.skip_until("keep_alive"))
|
||||||
keep_alive = std::chrono::milliseconds{data.consume_integer<uint64_t>()};
|
keep_alive = std::chrono::milliseconds{data.consume_integer<uint64_t>()};
|
||||||
if (data.skip_until("optional"))
|
if (data.skip_until("optional"))
|
||||||
optional = data.consume_integer<bool>();
|
optional = data.consume_integer<bool>();
|
||||||
|
|
|
@ -383,7 +383,7 @@ LokiMQ::~LokiMQ() {
|
||||||
ConnectionID LokiMQ::connect_sn(string_view pubkey, std::chrono::milliseconds keep_alive, string_view hint) {
|
ConnectionID LokiMQ::connect_sn(string_view pubkey, std::chrono::milliseconds keep_alive, string_view hint) {
|
||||||
check_started(proxy_thread, "connect");
|
check_started(proxy_thread, "connect");
|
||||||
|
|
||||||
detail::send_control(get_control_socket(), "CONNECT_SN", bt_serialize<bt_dict>({{"pubkey",pubkey}, {"keep-alive",keep_alive.count()}, {"hint",hint}}));
|
detail::send_control(get_control_socket(), "CONNECT_SN", bt_serialize<bt_dict>({{"pubkey",pubkey}, {"keep_alive",keep_alive.count()}, {"hint",hint}}));
|
||||||
|
|
||||||
return pubkey;
|
return pubkey;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1082,7 +1082,7 @@ inline void apply_send_option(bt_list&, bt_dict& control_data, const send_option
|
||||||
|
|
||||||
/// `keep_alive` specialization: increases the outgoing socket idle timeout (if shorter)
|
/// `keep_alive` specialization: increases the outgoing socket idle timeout (if shorter)
|
||||||
inline void apply_send_option(bt_list&, bt_dict& control_data, const send_option::keep_alive& timeout) {
|
inline void apply_send_option(bt_list&, bt_dict& control_data, const send_option::keep_alive& timeout) {
|
||||||
control_data["keep-alive"] = timeout.time.count();
|
control_data["keep_alive"] = timeout.time.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ void LokiMQ::proxy_send(bt_dict_consumer data) {
|
||||||
hint = data.consume_string_view();
|
hint = data.consume_string_view();
|
||||||
if (data.skip_until("incoming"))
|
if (data.skip_until("incoming"))
|
||||||
incoming = data.consume_integer<bool>();
|
incoming = data.consume_integer<bool>();
|
||||||
if (data.skip_until("keep-alive"))
|
if (data.skip_until("keep_alive"))
|
||||||
keep_alive = std::chrono::milliseconds{data.consume_integer<uint64_t>()};
|
keep_alive = std::chrono::milliseconds{data.consume_integer<uint64_t>()};
|
||||||
if (data.skip_until("optional"))
|
if (data.skip_until("optional"))
|
||||||
optional = data.consume_integer<bool>();
|
optional = data.consume_integer<bool>();
|
||||||
|
|
Loading…
Reference in a new issue