summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-07-17 14:18:08 +0200
committerRemi Collet <remi@php.net>2024-07-17 14:18:08 +0200
commitf4948e421cbcef064a7da3d305f32cf07dfde9b0 (patch)
treea94ffbc66dc10792397a74680d82f0410ee2ccdc
parentcb5d426bc3250352d3d3785fe95763ec5c2c5c3d (diff)
better workaround
-rw-r--r--grpc-workaround.patch25
1 files changed, 12 insertions, 13 deletions
diff --git a/grpc-workaround.patch b/grpc-workaround.patch
index f78972b..feaf896 100644
--- a/grpc-workaround.patch
+++ b/grpc-workaround.patch
@@ -1,14 +1,13 @@
-diff -up grpc-1.65.1/src/core/lib/experiments/config.cc.old grpc-1.65.1/src/core/lib/experiments/config.cc
---- grpc-1.65.1/src/core/lib/experiments/config.cc.old 2024-07-17 09:22:02.841621161 +0200
-+++ grpc-1.65.1/src/core/lib/experiments/config.cc 2024-07-17 09:22:06.744775200 +0200
-@@ -227,8 +227,10 @@ void PrintExperimentsList() {
- }
- if (experiment_status.empty()) {
- if (!defaulted_on_experiments.empty()) {
-+/* https://github.com/grpc/grpc/issues/37178
- gpr_log(GPR_INFO, "gRPC experiments enabled: %s",
- absl::StrJoin(defaulted_on_experiments, ", ").c_str());
-+*/
+diff -up grpc-1.65.1/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc.old grpc-1.65.1/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc
+--- grpc-1.65.1/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc.old 2024-07-17 14:08:10.982474321 +0200
++++ grpc-1.65.1/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc 2024-07-17 14:12:26.562502991 +0200
+@@ -90,8 +90,7 @@ class StderrLogSink final : public LogSi
+ ~StderrLogSink() override = default;
+
+ void Send(const absl::LogEntry& entry) override {
+- if (entry.log_severity() < absl::StderrThreshold() &&
+- absl::log_internal::IsInitialized()) {
++ if (entry.log_severity() < absl::StderrThreshold()) {
+ return;
}
- } else {
- if (defaulted_on_experiments.empty()) {
+