commit bd1fedf1bc26258e308c3c527d545174127e03d6
author Greg Hartman <ghartman@google.com> Mon Jul 09 18:15:30 2018 -0700
committer Greg Hartman <ghartman@google.com> Thu Jul 12 11:08:34 2018 -0700
tree 465c44749d9acf575f52c059005c7745c4f0191e
parent 91f8142b22126f76db78a6804b47b4462d6fd3e1

Silence repeated log messages about adb connections

BUG: 80104636
Test: Local build and boot
Change-Id: I86a4ff91bdc0d89309bc0840d6cf3f2291c66c13

common/libs/fs/shared_fd.cpp

diff --git a/common/libs/fs/shared_fd.cpp b/common/libs/fs/shared_fd.cpp
index d2b2ea0..b4a401c 100644
--- a/common/libs/fs/shared_fd.cpp
+++ b/common/libs/fs/shared_fd.cpp
@@ -293,7 +293,6 @@
     return rval;
   }
   if (rval->Connect(reinterpret_cast<sockaddr*>(&addr), addrlen) == -1) {
-    LOG(ERROR) << "Connect failed; name=" << name << ": " << rval->StrError();
     return SharedFD(
         std::shared_ptr<FileInstance>(new FileInstance(-1, rval->GetErrno())));
   }
@@ -311,7 +310,6 @@
   }
   if (rval->Connect(reinterpret_cast<const sockaddr*>(&addr),
                     sizeof addr) < 0) {
-    LOG(ERROR) << "Connect() failed" << rval->StrError();
     return SharedFD(
         std::shared_ptr<FileInstance>(new FileInstance(-1, rval->GetErrno())));
   }

host/libs/adb_connection_maintainer/adb_connection_maintainer.cpp

diff --git a/host/libs/adb_connection_maintainer/adb_connection_maintainer.cpp b/host/libs/adb_connection_maintainer/adb_connection_maintainer.cpp
index 0d695b6..026622e 100644
--- a/host/libs/adb_connection_maintainer/adb_connection_maintainer.cpp
+++ b/host/libs/adb_connection_maintainer/adb_connection_maintainer.cpp
@@ -102,7 +102,6 @@
 
 bool AdbSendMessage(cvd::SharedFD sock, const std::string& message) {
   if (!sock->IsOpen()) {
-    LOG(INFO) << "failed to connect to adb daemon";
     return false;
   }
   if (!SendAll(sock, message)) {
@@ -175,14 +174,11 @@
 static constexpr int kAdbCommandGapTime = 5;
 
 void EstablishConnection(int port) {
-  while (true) {
-    LOG(INFO) << "Attempting to connect to device on port " << port;
-    if (AdbConnect(port)) {
-      LOG(DEBUG) << "adb connect message for " << port << " successfully sent";
-      break;
-    }
+  LOG(INFO) << "Attempting to connect to device on port " << port;
+  while (!AdbConnect(port)) {
     sleep(kAdbCommandGapTime);
   }
+  LOG(INFO) << "adb connect message for " << port << " successfully sent";
   sleep(kAdbCommandGapTime);
 }