update blackwidow && adjust the slow log information display order (#298

)
OpenAtomFoundation · Jul 20, 2018 · c95871b · c95871b
1 parent 4bb5720
commit c95871b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/pika_binlog_bgworker.cc b/src/pika_binlog_bgworker.cc
@@ -97,7 +97,7 @@ void BinlogBGWorker::DoBinlogBG(void* arg) {
   if (g_pika_conf->slowlog_slower_than() >= 0) {
     int64_t duration = slash::NowMicros() - start_us;
     if (duration > g_pika_conf->slowlog_slower_than()) {
-      LOG(ERROR) << "command:" << opt << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration;
+      LOG(ERROR) << "command: " << opt << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration;
     }
   }
 

diff --git a/src/pika_client_conn.cc b/src/pika_client_conn.cc
@@ -242,7 +242,7 @@ std::string PikaClientConn::DoCmd(
           break;
         }
       }
-      LOG(ERROR) << "command:" << slow_log << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration << ", ip_port: " << ip_port();
+      LOG(ERROR) << "ip_port: "<< ip_port() << ", command:" << slow_log << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration;
     }
   }
 

diff --git a/src/pika_new_master_conn.cc b/src/pika_new_master_conn.cc
@@ -71,7 +71,7 @@ pink::ReadStatus PikaNewMasterConn::ReadBody(uint32_t body_length) {
   if (rbuf_len_ == HEADER_LEN + body_length) {
     return pink::kReadAll;
   } else if (rbuf_len_ > HEADER_LEN + body_length) {
-    LOG(ERROR) << "rbuf_len_ larger than sum of header length (6 Byte) and body_length, rbuf_len_:"
+    LOG(INFO) << "rbuf_len_ larger than sum of header length (6 Byte) and body_length, rbuf_len_:"
       << rbuf_len_ << " body_length:" << body_length;
   }
 
@@ -119,14 +119,14 @@ pink::ReadStatus PikaNewMasterConn::ParseRedisRESPArray(const std::string& conte
   int32_t content_len = content.size();
   long multibulk_len = 0, bulk_len = 0;
   if (content.empty() || content[0] != '*') {
-    LOG(ERROR) << "Content empty() or the first character of the redis protocol string not equal '*'";
+    LOG(INFO) << "Content empty() or the first character of the redis protocol string not equal '*'";
     return pink::kParseError;
   }
   pos = FindNextSeparators(content, next_parse_pos);
   if (pos != -1 && GetNextNum(content, next_parse_pos, pos, &multibulk_len) != -1) {
     next_parse_pos = pos + 1;
   } else {
-    LOG(ERROR) << "Find next separators error or get next num error";
+    LOG(INFO) << "Find next separators error or get next num error";
     return pink::kParseError;
   }
 
@@ -139,7 +139,7 @@ pink::ReadStatus PikaNewMasterConn::ParseRedisRESPArray(const std::string& conte
   argv->clear();
   while (multibulk_len) {
     if (content[next_parse_pos] != '$') {
-      LOG(ERROR) << "The first charactor of the RESP type element not equal '$'";
+      LOG(INFO) << "The first charactor of the RESP type element not equal '$'";
       return pink::kParseError;
     }
 
@@ -155,12 +155,12 @@ pink::ReadStatus PikaNewMasterConn::ParseRedisRESPArray(const std::string& conte
         multibulk_len--;
       }
     } else {
-      LOG(ERROR) << "Find next separators error or get next num error";
+      LOG(INFO) << "Find next separators error or get next num error";
       return pink::kParseError;
     }
   }
   if (content_len != next_parse_pos) {
-    LOG(ERROR) << "Incomplete parse";
+    LOG(INFO) << "Incomplete parse";
     return pink::kParseError;
   } else {
     return pink::kOk;
@@ -187,7 +187,7 @@ pink::ReadStatus PikaNewMasterConn::GetRequest() {
   slash::GetFixed32(&header, &body_length);
 
   if (type != kTypeAuth && type != kTypeBinlog) {
-    LOG(ERROR) << "Unrecognizable Type: " << type;
+    LOG(INFO) << "Unrecognizable Type: " << type;
     return pink::kParseError;
   }
 
@@ -211,7 +211,7 @@ pink::ReadStatus PikaNewMasterConn::GetRequest() {
   std::string body(rbuf_ + HEADER_LEN, body_length);
   if (type == kTypeAuth) {
     if ((status = ParseRedisRESPArray(body, &argv)) != pink::kOk) {
-      LOG(ERROR) << "Type auth ParseRedisRESPArray error";
+      LOG(INFO) << "Type auth ParseRedisRESPArray error";
       return status;
     }
     if (!ProcessAuth(argv)) {

diff --git a/third/blackwidow b/third/blackwidow
-Original file line number
+Diff line change
@@ Expand Up / @@ -242,7 +242,7 @@ std::string PikaClientConn::DoCmd( @@
               break;
             }
           }
-          LOG(ERROR) << "command:" << slow_log << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration << ", ip_port: " << ip_port();
+          LOG(ERROR) << "ip_port: "<< ip_port() << ", command:" << slow_log << ", start_time(s): " << start_us / 1000000 << ", duration(us): " << duration;
         }
       }
@@ Expand Down @@
+6 −1		src/base_filter.h
+1 −0		src/blackwidow.cc
+3 −2		src/redis_hashes.cc
+11 −4		src/redis_lists.cc
+3 −2		src/redis_sets.cc
+3 −1		src/redis_strings.cc
+5 −2		src/redis_zsets.cc