g3proxy: fix site level socks_tcp_connect conn_total stats

bytedance · Aug 14, 2023 · 54ce25c · 54ce25c
1 parent fce37af
commit 54ce25c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/g3bench/src/target/keyless/cloudflare/connection/multiplex.rs b/g3bench/src/target/keyless/cloudflare/connection/multiplex.rs
@@ -127,7 +127,6 @@ impl UnderlyingWriterState {
         W: AsyncWrite + Unpin,
     {
         if self.init {
-            // TODO use OnceLock
             let mut waker = self.shared.write_waker.write().unwrap();
             *waker = Some(cx.waker().clone());
             drop(waker);

diff --git a/g3proxy/src/serve/socks_proxy/task/negotiation/task.rs b/g3proxy/src/serve/socks_proxy/task/negotiation/task.rs
@@ -209,7 +209,6 @@ impl SocksProxyNegotiationTask {
                             self.ctx.server_stats.extra_tags(),
                         );
                         user_ctx.req_stats().conn_total.add_socks();
-                        // TODO handle site level conn_total stats in each tasks
                         Some(user_ctx)
                     } else {
                         None
@@ -232,7 +231,6 @@ impl SocksProxyNegotiationTask {
                         match user_ctx.check_password(password.as_original()) {
                             Ok(_) => {
                                 user_ctx.req_stats().conn_total.add_socks();
-                                // TODO handle site level conn_total stats in each tasks
                                 v5::auth::send_user_auth_success(&mut clt_w)
                                     .await
                                     .map_err(ServerTaskError::ClientTcpWriteFailed)?;

diff --git a/g3proxy/src/serve/socks_proxy/task/tcp_connect/task.rs b/g3proxy/src/serve/socks_proxy/task/tcp_connect/task.rs
@@ -57,6 +57,7 @@ impl SocksProxyTcpConnectTask {
                 ctx.server_stats.extra_tags(),
                 &upstream,
             );
+            user_ctx.site_req_stats().map(|s| s.conn_total.add_socks());
         }
         SocksProxyTcpConnectTask {
             socks_version,