diff options
author | ulanovgeorgiy <ulanovgeorgiy@yandex-team.com> | 2023-02-10 15:58:09 +0300 |
---|---|---|
committer | ulanovgeorgiy <ulanovgeorgiy@yandex-team.com> | 2023-02-10 15:58:09 +0300 |
commit | 6f49b8de56ec7992e8d93b5b4c0807cb28caa549 (patch) | |
tree | 0bbafefddedaca9ae6bd7ec7105b05563984894f /library/cpp/protobuf | |
parent | 17cd71adfa9b6b26efa7e5dee5810d471601b818 (diff) | |
download | ydb-6f49b8de56ec7992e8d93b5b4c0807cb28caa549.tar.gz |
remove flag ForceWriteParsingErrorsToCerr
Diffstat (limited to 'library/cpp/protobuf')
-rw-r--r-- | library/cpp/protobuf/util/pb_io.cpp | 17 | ||||
-rw-r--r-- | library/cpp/protobuf/util/pb_io.h | 4 |
2 files changed, 4 insertions, 17 deletions
diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp index 92f3675b53..77ee1c6068 100644 --- a/library/cpp/protobuf/util/pb_io.cpp +++ b/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(); } } diff --git a/library/cpp/protobuf/util/pb_io.h b/library/cpp/protobuf/util/pb_io.h index fbce966ebe..b4a0c654b3 100644 --- a/library/cpp/protobuf/util/pb_io.h +++ b/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); |