c8h4/resply
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Handle publish-messages even when no handler is present.

Browse source
This commit is contained in:
Christoph Heiss 2018-03-04 15:35:09 +01:00
parent 48b94e50d6
commit 98f6ed58a8
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libresply.cc
View file

@ -123,7 +123,7 @@ public:
asio::write(socket_, asio::buffer(command), error_code);
check_asio_error(error_code);
return receive_response();
return in_subscribed_mode() ? Result{} : receive_response();
}
std::vector<Result> send_batch(const std::vector<std::string>& commands)
@ -144,14 +144,17 @@ public:
for (;;) {
Result result{receive_response()};
std::string& channel = result.array[1].string;
std::string& message = result.array[2].string;
if (result.type == Result::Type::Array && result.array.size() == 3 &&
result.array.front().type == Result::Type::String && result.array.front().string == "message") {
std::string& channel = result.array[1].string;
std::string& message = result.array[2].string;
if (channel_callbacks_.count(channel)) {
channel_callbacks_[channel](channel, message);
} else {
std::cout << "Message on channel '" << channel
<< "': " << message << std::endl;
if (channel_callbacks_.count(channel)) {
channel_callbacks_[channel](channel, message);
} else {
std::cout << "Message on channel '" << channel
<< "': " << message << std::endl;
}
}
}
}
@ -171,6 +174,11 @@ public:
return port_;
}
bool in_subscribed_mode() const
{
return channel_callbacks_.size();
}
private:
Result receive_response()
{
@ -245,7 +253,7 @@ const std::string& Client::port() const { return impl_->port(); }
bool Client::in_subscribed_mode() const
{
return impl_->channel_callbacks().size();
return impl_->in_subscribed_mode();
}
Client& Client::subscribe(const std::string& channel, ChannelCallback callback)