Move VERBOSITY_NAME(connections) out of utils/logging.h.

GitOrigin-RevId: ec768560b9c87ff64d3d8b9a0c821f75abf3321a
ConfDev · Aug 17, 2018 · 25826e2 · 25826e2
1 parent 811cc8f
commit 25826e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/td/telegram/net/ConnectionCreator.cpp b/td/telegram/net/ConnectionCreator.cpp
@@ -41,6 +41,8 @@
 
 namespace td {
 
+static int VERBOSITY_NAME(connections) = VERBOSITY_NAME(DEBUG) - 2;
+
 namespace detail {
 
 class StatsCallback final : public mtproto::RawConnection::StatsCallback {
@@ -855,8 +857,8 @@ Result<SocketFd> ConnectionCreator::find_connection(const ProxyInfo &proxy, DcId
 
   if (proxy.use_proxy()) {
     extra.mtproto_ip = info.option->get_ip_address();
-    extra.debug_str = PSTRING() << (proxy.use_socks5_proxy() ? "Socks5 " : "HTTP ") << proxy.ip_address() << " --> "
-                                << extra.mtproto_ip << extra.debug_str;
+    extra.debug_str = PSTRING() << (proxy.use_socks5_proxy() ? "Socks5" : (only_http ? "HTTP_ONLY" : "HTTP_TCP")) << ' '
+                                << proxy.ip_address() << " --> " << extra.mtproto_ip << extra.debug_str;
     LOG(INFO) << "Create: " << extra.debug_str;
     return SocketFd::open(proxy.ip_address());
   } else {

diff --git a/tdutils/td/utils/logging.cpp b/tdutils/td/utils/logging.cpp
@@ -33,7 +33,6 @@ int VERBOSITY_NAME(td_requests) = VERBOSITY_NAME(INFO);
 int VERBOSITY_NAME(dc) = VERBOSITY_NAME(DEBUG) + 2;
 int VERBOSITY_NAME(files) = VERBOSITY_NAME(DEBUG) + 2;
 int VERBOSITY_NAME(mtproto) = VERBOSITY_NAME(DEBUG) + 7;
-int VERBOSITY_NAME(connections) = VERBOSITY_NAME(DEBUG) + 8;
 int VERBOSITY_NAME(raw_mtproto) = VERBOSITY_NAME(DEBUG) + 10;
 int VERBOSITY_NAME(fd) = VERBOSITY_NAME(DEBUG) + 9;
 int VERBOSITY_NAME(actor) = VERBOSITY_NAME(DEBUG) + 10;

diff --git a/tdutils/td/utils/logging.h b/tdutils/td/utils/logging.h
@@ -111,7 +111,6 @@ extern int VERBOSITY_NAME(level);
 // TODO Not part of utils. Should be in some separate file
 extern int VERBOSITY_NAME(mtproto);
 extern int VERBOSITY_NAME(raw_mtproto);
-extern int VERBOSITY_NAME(connections);
 extern int VERBOSITY_NAME(dc);
 extern int VERBOSITY_NAME(fd);
 extern int VERBOSITY_NAME(net_query);