mirror of
https://github.com/tdlight-team/tdlight-telegram-bot-api.git
synced 2024-11-03 10:15:31 +01:00
Remove pending_update_count_ field.
This commit is contained in:
parent
789d5bb610
commit
fcdb824f86
@ -253,7 +253,7 @@ void WebhookActor::on_socket_ready_async(td::Result<td::SocketFd> r_fd, td::int6
|
|||||||
}
|
}
|
||||||
|
|
||||||
void WebhookActor::create_new_connections() {
|
void WebhookActor::create_new_connections() {
|
||||||
size_t need_connections = queues_.size();
|
size_t need_connections = queue_updates_.size();
|
||||||
if (need_connections > static_cast<size_t>(max_connections_)) {
|
if (need_connections > static_cast<size_t>(max_connections_)) {
|
||||||
need_connections = max_connections_;
|
need_connections = max_connections_;
|
||||||
}
|
}
|
||||||
@ -394,7 +394,6 @@ void WebhookActor::load_updates() {
|
|||||||
dest.expires_at_ = update.expires_at;
|
dest.expires_at_ = update.expires_at;
|
||||||
dest.queue_id_ = update.extra;
|
dest.queue_id_ = update.extra;
|
||||||
tqueue_offset_ = update.id.next().move_as_ok();
|
tqueue_offset_ = update.id.next().move_as_ok();
|
||||||
pending_update_count_++;
|
|
||||||
|
|
||||||
if (dest.queue_id_ == 0) {
|
if (dest.queue_id_ == 0) {
|
||||||
dest.queue_id_ = unique_queue_id_++;
|
dest.queue_id_ = unique_queue_id_++;
|
||||||
@ -490,7 +489,6 @@ void WebhookActor::on_update_error(td::TQueue::EventId event_id, td::Slice error
|
|||||||
queues_.emplace(update.wakeup_at_, update.queue_id_);
|
queues_.emplace(update.wakeup_at_, update.queue_id_);
|
||||||
VLOG(webhook) << "Delay update " << event_id << " for " << (update.wakeup_at_ - now) << " seconds because of "
|
VLOG(webhook) << "Delay update " << event_id << " for " << (update.wakeup_at_ - now) << " seconds because of "
|
||||||
<< error << " after " << update.fail_count_ << " fails";
|
<< error << " after " << update.fail_count_ << " fails";
|
||||||
pending_update_count_++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
td::Status WebhookActor::send_update() {
|
td::Status WebhookActor::send_update() {
|
||||||
@ -499,7 +497,7 @@ td::Status WebhookActor::send_update() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (queues_.empty()) {
|
if (queues_.empty()) {
|
||||||
return td::Status::Error("No updates");
|
return td::Status::Error("No pending updates");
|
||||||
}
|
}
|
||||||
auto it = queues_.begin();
|
auto it = queues_.begin();
|
||||||
if (it->wakeup_at > td::Time::now()) {
|
if (it->wakeup_at > td::Time::now()) {
|
||||||
@ -531,7 +529,6 @@ td::Status WebhookActor::send_update() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto &connection = *Connection::from_list_node(ready_connections_.get());
|
auto &connection = *Connection::from_list_node(ready_connections_.get());
|
||||||
pending_update_count_--;
|
|
||||||
connection.event_id_ = update.id_;
|
connection.event_id_ = update.id_;
|
||||||
|
|
||||||
VLOG(webhook) << "Send update " << update.id_ << " from queue " << queue_id << " into connection " << connection.id_
|
VLOG(webhook) << "Send update " << update.id_ << " from queue " << queue_id << " into connection " << connection.id_
|
||||||
@ -545,11 +542,9 @@ td::Status WebhookActor::send_update() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void WebhookActor::send_updates() {
|
void WebhookActor::send_updates() {
|
||||||
VLOG(webhook) << "Have " << pending_update_count_ << " pending updates to send";
|
VLOG(webhook) << "Have " << (queues_.size() + update_map_.size() - queue_updates_.size()) << " pending updates in "
|
||||||
while (pending_update_count_ > 0) {
|
<< queues_.size() << " queues to send";
|
||||||
if (send_update().is_error()) {
|
while (send_update().is_ok()) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,8 +118,6 @@ class WebhookActor : public td::HttpOutboundConnection::Callback {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
td::int32 pending_update_count_ = 0;
|
|
||||||
|
|
||||||
td::TQueue::EventId tqueue_offset_;
|
td::TQueue::EventId tqueue_offset_;
|
||||||
std::size_t max_loaded_updates_ = 0;
|
std::size_t max_loaded_updates_ = 0;
|
||||||
struct EventIdHash {
|
struct EventIdHash {
|
||||||
|
Loading…
Reference in New Issue
Block a user