Просмотр исходного кода

remove flag ForceWriteParsingErrorsToCerr

ulanovgeorgiy 2 лет назад
Родитель
Сommit
6f49b8de56
2 измененных файлов с 4 добавлено и 17 удалено
  1. 3 14
      library/cpp/protobuf/util/pb_io.cpp
  2. 1 3
      library/cpp/protobuf/util/pb_io.h

+ 3 - 14
library/cpp/protobuf/util/pb_io.cpp

@@ -180,26 +180,15 @@ void ParseFromTextFormat(IInputStream& in, NProtoBuf::Message& m,
     NProtoBuf::TextFormat::Parser p;
     ConfigureParser(options, p);
 
-    bool writeErrorToException = !(options & EParseFromTextFormatOption::ForceWriteParsingErrorsToCerr);
     TStringStream errorLog;
     THolder<TErrorCollector> errorCollector;
-
-    if (writeErrorToException) {
-        errorCollector = MakeHolder<TErrorCollector>(m, &errorLog, warningStream);
-        p.RecordErrorsTo(errorCollector.Get());
-    } else if (warningStream) {
-        errorCollector = MakeHolder<TErrorCollector>(m, &Cerr, warningStream);
-        p.RecordErrorsTo(errorCollector.Get());
-    }
+    errorCollector = MakeHolder<TErrorCollector>(m, &errorLog, warningStream);
+    p.RecordErrorsTo(errorCollector.Get());
 
     if (!p.Parse(&adaptor, &m)) {
         // remove everything that may have been read
         m.Clear();
-        if (Y_LIKELY(writeErrorToException)) {
-            ythrow yexception() << errorLog.Str();
-        } else {
-            ythrow yexception() << "ParseFromTextFormat failed on Parse for " << m.GetTypeName();
-        }
+        ythrow yexception() << errorLog.Str();
     }
 }
 

+ 1 - 3
library/cpp/protobuf/util/pb_io.h

@@ -58,9 +58,7 @@ void SerializeToTextFormatWithEnumId(const NProtoBuf::Message& m, IOutputStream&
 
 enum class EParseFromTextFormatOption : ui64 {
     // Unknown fields will be ignored by the parser
-    AllowUnknownField = 1,
-    // Error message will be written to stderr in the original format
-    ForceWriteParsingErrorsToCerr = 2
+    AllowUnknownField = 1
 };
 
 Y_DECLARE_FLAGS(EParseFromTextFormatOptions, EParseFromTextFormatOption);