Improve log message spelling.

1 files changed, 14 insertions, 18 deletions

diff --git a/benchmark/bench_misc.cpp b/benchmark/bench_misc.cpp
index 8345438f7..f108b4b6a 100644
--- a/benchmark/bench_misc.cpp
+++ b/benchmark/bench_misc.cpp
@@ -421,13 +421,12 @@ class IdDuplicateCheckerOld {
     if (saved_message_ids_.size() == MAX_SAVED_MESSAGE_IDS) {
       auto oldest_message_id = *saved_message_ids_.begin();
       if (message_id < oldest_message_id) {
-        return td::Status::Error(2, PSLICE() << "Ignore very old message_id "
-                                             << td::tag("oldest message_id", oldest_message_id)
-                                             << td::tag("got message_id", message_id));
+        return td::Status::Error(2, PSLICE() << "Ignore very old message " << message_id
+                                             << " older than the oldest known message " << oldest_message_id);
       }
     }
     if (saved_message_ids_.count(message_id) != 0) {
-      return td::Status::Error(1, PSLICE() << "Ignore duplicated message_id " << td::tag("message_id", message_id));
+      return td::Status::Error(1, PSLICE() << "Ignore already processed message " << message_id);
     }
 
     saved_message_ids_.insert(message_id);
@@ -451,16 +450,15 @@ class IdDuplicateCheckerNew {
   td::Status check(td::int64 message_id) {
     auto insert_result = saved_message_ids_.insert(message_id);
     if (!insert_result.second) {
-      return td::Status::Error(1, PSLICE() << "Ignore duplicated message_id " << td::tag("message_id", message_id));
+      return td::Status::Error(1, PSLICE() << "Ignore already processed message " << message_id);
     }
     if (saved_message_ids_.size() == MAX_SAVED_MESSAGE_IDS + 1) {
       auto begin_it = saved_message_ids_.begin();
       bool is_very_old = begin_it == insert_result.first;
       saved_message_ids_.erase(begin_it);
       if (is_very_old) {
-        return td::Status::Error(2, PSLICE() << "Ignore very old message_id "
-                                             << td::tag("oldest message_id", *saved_message_ids_.begin())
-                                             << td::tag("got message_id", message_id));
+        return td::Status::Error(2, PSLICE() << "Ignore very old message " << message_id
+                                             << " older than the oldest known message " << *saved_message_ids_.begin());
       }
     }
     return td::Status::OK();
@@ -477,16 +475,15 @@ class IdDuplicateCheckerNewOther {
   }
   td::Status check(td::int64 message_id) {
     if (!saved_message_ids_.insert(message_id).second) {
-      return td::Status::Error(1, PSLICE() << "Ignore duplicated message_id " << td::tag("message_id", message_id));
+      return td::Status::Error(1, PSLICE() << "Ignore already processed message " << message_id);
     }
     if (saved_message_ids_.size() == MAX_SAVED_MESSAGE_IDS + 1) {
       auto begin_it = saved_message_ids_.begin();
       bool is_very_old = *begin_it == message_id;
       saved_message_ids_.erase(begin_it);
       if (is_very_old) {
-        return td::Status::Error(2, PSLICE() << "Ignore very old message_id "
-                                             << td::tag("oldest message_id", *saved_message_ids_.begin())
-                                             << td::tag("got message_id", message_id));
+        return td::Status::Error(2, PSLICE() << "Ignore very old message " << message_id
+                                             << " older than the oldest known message " << *saved_message_ids_.begin());
       }
     }
     return td::Status::OK();
@@ -505,14 +502,14 @@ class IdDuplicateCheckerNewSimple {
   td::Status check(td::int64 message_id) {
     auto insert_result = saved_message_ids_.insert(message_id);
     if (!insert_result.second) {
-      return td::Status::Error(1, "Ignore duplicated message_id");
+      return td::Status::Error(1, "Ignore already processed message");
     }
     if (saved_message_ids_.size() == MAX_SAVED_MESSAGE_IDS + 1) {
       auto begin_it = saved_message_ids_.begin();
       bool is_very_old = begin_it == insert_result.first;
       saved_message_ids_.erase(begin_it);
       if (is_very_old) {
-        return td::Status::Error(2, "Ignore very old message_id");
+        return td::Status::Error(2, "Ignore very old message");
       }
     }
     return td::Status::OK();
@@ -540,13 +537,12 @@ class IdDuplicateCheckerArray {
       return td::Status::OK();
     }
     if (end_pos_ >= max_size && message_id < saved_message_ids_[0]) {
-      return td::Status::Error(2, PSLICE() << "Ignore very old message_id "
-                                           << td::tag("oldest message_id", saved_message_ids_[0])
-                                           << td::tag("got message_id", message_id));
+      return td::Status::Error(2, PSLICE() << "Ignore very old message " << message_id
+                                           << " older than the oldest known message " << saved_message_ids_[0]);
     }
     auto it = std::lower_bound(&saved_message_ids_[0], &saved_message_ids_[end_pos_], message_id);
     if (*it == message_id) {
-      return td::Status::Error(1, PSLICE() << "Ignore duplicated message_id " << td::tag("message_id", message_id));
+      return td::Status::Error(1, PSLICE() << "Ignore already processed message " << message_id);
     }
     std::copy_backward(it, &saved_message_ids_[end_pos_], &saved_message_ids_[end_pos_ + 1]);
     *it = message_id;