fix

nshestakov · Mar 6, 2024 · 3a05c56 · 3a05c56
1 parent f93aa1b
commit 3a05c56
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/ydb/core/client/server/grpc_server.cpp b/ydb/core/client/server/grpc_server.cpp
@@ -10,7 +10,6 @@
 #include <library/cpp/json/json_writer.h>
 
 #include <util/string/join.h>
-#include <util/system/env.h>
 
 #include <google/protobuf/text_format.h>
 
@@ -79,8 +78,6 @@ class TSimpleRequest
         , InProgress_(false)
     {
         LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] created request Name# %s", this, Name);
-
-        LogBody = "BODY" == GetEnv("YDB_LOGGING");
     }
 
     ~TSimpleRequest() {
@@ -271,7 +268,7 @@ class TSimpleRequest
     void Finish(const TOut& resp, ui32 status) {
         auto makeResponseString = [&] {
             TString x;
-            if (LogBody) {
+            if (NYdbGrpc::LogBodyEnabled) {
                 google::protobuf::TextFormat::Printer printer;
                 printer.SetSingleLineMode(true);
                 printer.PrintToString(resp, &x);
@@ -310,7 +307,7 @@ class TSimpleRequest
         auto makeRequestString = [&] {
             TString resp;
             if (ok) {
-                if (LogBody) {
+                if (NYdbGrpc::LogBodyEnabled) {
                     google::protobuf::TextFormat::Printer printer;
                     printer.SetSingleLineMode(true);
                     printer.PrintToString(Request, &resp);
@@ -403,8 +400,6 @@ class TSimpleRequest
     bool RequestDestroyed_ = false;
     bool CallInProgress_ = false;
     bool Finished_ = false;
-
-    bool LogBody;
 };
 
 } // namespace

diff --git a/ydb/core/grpc_streaming/grpc_streaming.h b/ydb/core/grpc_streaming/grpc_streaming.h
@@ -350,9 +350,13 @@ class TGRpcStreamingRequest final
         auto dumpResultText = [&] {
             TString text;
             if (status == NYdbGrpc::EQueueEventStatus::OK) {
-                google::protobuf::TextFormat::Printer printer;
-                printer.SetSingleLineMode(true);
-                printer.PrintToString(ReadInProgress->Record, &text);
+                if (NYdbGrpc::LogBodyEnabled) {
+                    google::protobuf::TextFormat::Printer printer;
+                    printer.SetSingleLineMode(true);
+                    printer.PrintToString(ReadInProgress->Record, &text);
+                } else {
+                    text = "<hidden>";
+                }
             } else {
                 text = "<not ok>";
             }
@@ -402,9 +406,13 @@ class TGRpcStreamingRequest final
     bool Write(TOut&& message, const grpc::WriteOptions& options = { }, const grpc::Status* status = nullptr) {
         auto dumpMessageText = [&] {
             TString text;
-            google::protobuf::TextFormat::Printer printer;
-            printer.SetSingleLineMode(true);
-            printer.PrintToString(message, &text);
+            if (NYdbGrpc::LogBodyEnabled) {
+                google::protobuf::TextFormat::Printer printer;
+                printer.SetSingleLineMode(true);
+                printer.PrintToString(message, &text);
+            } else {
+                text = "<hidden>";
+            }
             return text;
         };
 

diff --git a/ydb/library/grpc/server/logger.h b/ydb/library/grpc/server/logger.h
@@ -3,9 +3,13 @@
 #include <library/cpp/logger/priority.h>
 
 #include <util/generic/ptr.h>
+#include <util/system/env.h>
+
 
 namespace NYdbGrpc {
 
+static bool LogBodyEnabled = "BODY" == GetEnv("YDB_GRPC_SERVER_LOGGING");    
+
 class TLogger: public TThrRefBase {
 protected:
     TLogger() = default;