ignore empty lines if "decode line fail, not a json string"

btccom · Apr 10, 2020 · 0222174 · 0222174
1 parent 0ac0015
commit 0222174
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/Utils.cc b/src/Utils.cc
@@ -228,3 +228,7 @@ string str2lower(const string &str) {
   std::transform(data.begin(), data.end(), data.begin(), ::tolower);
   return data;
 }
+
+bool strEmpty(const string &str) {
+  return str.find_last_not_of(" \t\f\v\n\r") == str.npos;
+}
diff --git a/src/Utils.h b/src/Utils.h
@@ -133,5 +133,6 @@ bool parseConfJson(const string &jsonStr,
 const char *splitNotify(const string &line, int number = 14);
 
 string str2lower(const string &str);
+bool strEmpty(const string &str);
 
 #endif
diff --git a/src/bitcoin/ServerBitcoin.cc b/src/bitcoin/ServerBitcoin.cc
@@ -503,7 +503,9 @@ void UpStratumClientBitcoin::handleStratumMessage(const string &line) {
 
   StratumMessageBitcoin smsg(line);
   if (!smsg.isValid()) {
-    LOG(ERROR) << "decode line fail, not a json string" << std::endl;
+    if (!strEmpty(line)) {
+      LOG(ERROR) << "decode line fail, not a json string: " << line << std::endl;
+    }
     return;
   }
 
@@ -719,7 +721,9 @@ void StratumSessionBitcoin::handleStratumMessage(const string &line) {
 
   StratumMessageBitcoin smsg(line);
   if (!smsg.isValid()) {
-    LOG(ERROR) << "decode line fail, not a json string" << std::endl;
+    if (!strEmpty(line)) {
+      LOG(ERROR) << "decode line fail, not a json string: " << line << std::endl;
+    }
     return;
   }
 

diff --git a/src/eth/ServerEth.cc b/src/eth/ServerEth.cc
@@ -587,7 +587,9 @@ void UpStratumClientEth::handleStratumMessage(const string &line) {
 
   StratumMessageEth smsg(line);
   if (!smsg.isValid()) {
-    LOG(ERROR) << "decode line fail, not a json string" << std::endl;
+    if (!strEmpty(line)) {
+      LOG(ERROR) << "decode line fail, not a json string: " << line << std::endl;
+    }
     return;
   }
 
@@ -792,7 +794,9 @@ void StratumSessionEth::handleStratumMessage(const string &line) {
 
   StratumMessageEth smsg(line);
   if (!smsg.isValid()) {
-    LOG(ERROR) << "decode line fail, not a json string" << std::endl;
+    if (!strEmpty(line)) {
+      LOG(ERROR) << "decode line fail, not a json string: " << line << std::endl;
+    }
     return;
   }