commit 40d5cfdd6b99608742de1361f6d81844316e0877
author asedeno <asedeno@google.com> Mon May 08 13:47:03 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 08 13:48:00 2023 -0700
tree 58e903dcafa902155eae83e1bde884a41c056f6b
parent 1cb67d44d7c598726af97b72876a1a7978094457

masque_*_bin: use actual logging, not std::cerr

PiperOrigin-RevId: 530397536

quiche/quic/masque/masque_client_bin.cc

diff --git a/quiche/quic/masque/masque_client_bin.cc b/quiche/quic/masque/masque_client_bin.cc
index 445e56b..c4638ea 100644
--- a/quiche/quic/masque/masque_client_bin.cc
+++ b/quiche/quic/masque/masque_client_bin.cc
@@ -178,8 +178,8 @@
   if (!parsed_uri_template.scheme.is_nonempty() ||
       !parsed_uri_template.host.is_nonempty() ||
       !parsed_uri_template.path.is_nonempty()) {
-    std::cerr << "Failed to parse MASQUE URI template \"" << urls[0] << "\""
-              << std::endl;
+    QUIC_LOG(ERROR) << "Failed to parse MASQUE URI template \"" << urls[0]
+                    << "\"";
     return 1;
   }
   std::string host = uri_template.substr(parsed_uri_template.host.begin,
@@ -198,7 +198,7 @@
     } else if (mode_string == "connectip" || mode_string == "connect-ip") {
       masque_mode = MasqueMode::kConnectIp;
     } else {
-      std::cerr << "Invalid masque_mode \"" << mode_string << "\"" << std::endl;
+      QUIC_LOG(ERROR) << "Invalid masque_mode \"" << mode_string << "\"";
       return 1;
     }
   }
@@ -212,7 +212,7 @@
   } else if (address_family == 6) {
     address_family_for_lookup = AF_INET6;
   } else {
-    std::cerr << "Invalid address_family " << address_family << std::endl;
+    QUIC_LOG(ERROR) << "Invalid address_family " << address_family;
     return 1;
   }
   std::unique_ptr<MasqueClient> masque_client = MasqueClient::Create(
@@ -221,11 +221,11 @@
     return 1;
   }
 
-  std::cerr << "MASQUE is connected " << masque_client->connection_id()
-            << " in " << masque_mode << " mode" << std::endl;
+  QUIC_LOG(INFO) << "MASQUE is connected " << masque_client->connection_id()
+                 << " in " << masque_mode << " mode";
 
   if (bring_up_tun) {
-    std::cerr << "Bringing up tun" << std::endl;
+    QUIC_LOG(INFO) << "Bringing up tun";
     MasqueTunSession tun_session(event_loop.get(),
                                  masque_client->masque_client_session());
     masque_client->masque_client_session()->SendIpPacket(

quiche/quic/masque/masque_server_bin.cc

diff --git a/quiche/quic/masque/masque_server_bin.cc b/quiche/quic/masque/masque_server_bin.cc
index 148d640..b7966f0 100644
--- a/quiche/quic/masque/masque_server_bin.cc
+++ b/quiche/quic/masque/masque_server_bin.cc
@@ -48,7 +48,7 @@
   quic::MasqueMode masque_mode = quic::MasqueMode::kOpen;
   std::string mode_string = quiche::GetQuicheCommandLineFlag(FLAGS_masque_mode);
   if (!mode_string.empty() && mode_string != "open") {
-    std::cerr << "Invalid masque_mode \"" << mode_string << "\"" << std::endl;
+    QUIC_LOG(ERROR) << "Invalid masque_mode \"" << mode_string << "\"";
     return 1;
   }
 
@@ -65,7 +65,7 @@
     return 1;
   }
 
-  std::cerr << "Started " << masque_mode << " MASQUE server" << std::endl;
+  QUIC_LOG(INFO) << "Started " << masque_mode << " MASQUE server";
   server->HandleEventsForever();
   return 0;
 }