Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-26 00:48:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix native API log level enum values (#2151)

Browse source
This commit is contained in:
Otto Winter 2021-08-16 01:57:50 +02:00 committed by GitHub
parent 117b58ebe6
commit 9b48ff5775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
esphome/components/api/api.proto
View file

@ -555,9 +555,10 @@ enum LogLevel {
LOG_LEVEL_ERROR = 1; LOG_LEVEL_ERROR = 1;
LOG_LEVEL_WARN = 2; LOG_LEVEL_WARN = 2;
LOG_LEVEL_INFO = 3; LOG_LEVEL_INFO = 3;
LOG_LEVEL_DEBUG = 4; LOG_LEVEL_CONFIG = 4;
LOG_LEVEL_VERBOSE = 5; LOG_LEVEL_DEBUG = 5;
LOG_LEVEL_VERY_VERBOSE = 6; LOG_LEVEL_VERBOSE = 6;
LOG_LEVEL_VERY_VERBOSE = 7;
} }
message SubscribeLogsRequest { message SubscribeLogsRequest {
option (id) = 28; option (id) = 28;
@ -572,7 +573,6 @@ message SubscribeLogsResponse {
option (no_delay) = false; option (no_delay) = false;
LogLevel level = 1; LogLevel level = 1;
string tag = 2;
string message = 3; string message = 3;
bool send_failed = 4; bool send_failed = 4;
} }

2
esphome/components/api/api_connection.cpp
View file

@ -694,8 +694,6 @@ bool APIConnection::send_log_message(int level, const char *tag, const char *lin
auto buffer = this->create_buffer(); auto buffer = this->create_buffer();
// LogLevel level = 1; // LogLevel level = 1;
buffer.encode_uint32(1, static_cast<uint32_t>(level)); buffer.encode_uint32(1, static_cast<uint32_t>(level));
// string tag = 2;
// buffer.encode_string(2, tag, strlen(tag));
// string message = 3; // string message = 3;
buffer.encode_string(3, line, strlen(line)); buffer.encode_string(3, line, strlen(line));
// SubscribeLogsResponse - 29 // SubscribeLogsResponse - 29

11
esphome/components/api/api_pb2.cpp
View file

@ -120,6 +120,8 @@ template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel val
return "LOG_LEVEL_WARN"; return "LOG_LEVEL_WARN";
case enums::LOG_LEVEL_INFO: case enums::LOG_LEVEL_INFO:
return "LOG_LEVEL_INFO"; return "LOG_LEVEL_INFO";
case enums::LOG_LEVEL_CONFIG:
return "LOG_LEVEL_CONFIG";
case enums::LOG_LEVEL_DEBUG: case enums::LOG_LEVEL_DEBUG:
return "LOG_LEVEL_DEBUG"; return "LOG_LEVEL_DEBUG";
case enums::LOG_LEVEL_VERBOSE: case enums::LOG_LEVEL_VERBOSE:
@ -2334,10 +2336,6 @@ bool SubscribeLogsResponse::decode_varint(uint32_t field_id, ProtoVarInt value)
} }
bool SubscribeLogsResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) { bool SubscribeLogsResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
switch (field_id) { switch (field_id) {
case 2: {
this->tag = value.as_string();
return true;
}
case 3: { case 3: {
this->message = value.as_string(); this->message = value.as_string();
return true; return true;
@ -2348,7 +2346,6 @@ bool SubscribeLogsResponse::decode_length(uint32_t field_id, ProtoLengthDelimite
} }
void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const { void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const {
buffer.encode_enum<enums::LogLevel>(1, this->level); buffer.encode_enum<enums::LogLevel>(1, this->level);
buffer.encode_string(2, this->tag);
buffer.encode_string(3, this->message); buffer.encode_string(3, this->message);
buffer.encode_bool(4, this->send_failed); buffer.encode_bool(4, this->send_failed);
} }
@ -2360,10 +2357,6 @@ void SubscribeLogsResponse::dump_to(std::string &out) const {
out.append(proto_enum_to_string<enums::LogLevel>(this->level)); out.append(proto_enum_to_string<enums::LogLevel>(this->level));
out.append("\n"); out.append("\n");
out.append(" tag: ");
out.append("'").append(this->tag).append("'");
out.append("\n");
out.append(" message: "); out.append(" message: ");
out.append("'").append(this->message).append("'"); out.append("'").append(this->message).append("'");
out.append("\n"); out.append("\n");

8
esphome/components/api/api_pb2.h
View file

@ -58,9 +58,10 @@ enum LogLevel : uint32_t {
LOG_LEVEL_ERROR = 1, LOG_LEVEL_ERROR = 1,
LOG_LEVEL_WARN = 2, LOG_LEVEL_WARN = 2,
LOG_LEVEL_INFO = 3, LOG_LEVEL_INFO = 3,
LOG_LEVEL_DEBUG = 4, LOG_LEVEL_CONFIG = 4,
LOG_LEVEL_VERBOSE = 5, LOG_LEVEL_DEBUG = 5,
LOG_LEVEL_VERY_VERBOSE = 6, LOG_LEVEL_VERBOSE = 6,
LOG_LEVEL_VERY_VERBOSE = 7,
}; };
enum ServiceArgType : uint32_t { enum ServiceArgType : uint32_t {
SERVICE_ARG_TYPE_BOOL = 0, SERVICE_ARG_TYPE_BOOL = 0,
@ -627,7 +628,6 @@ class SubscribeLogsRequest : public ProtoMessage {
class SubscribeLogsResponse : public ProtoMessage { class SubscribeLogsResponse : public ProtoMessage {
public: public:
enums::LogLevel level{}; enums::LogLevel level{};
std::string tag{};
std::string message{}; std::string message{};
bool send_failed{false}; bool send_failed{false};
void encode(ProtoWriteBuffer buffer) const override; void encode(ProtoWriteBuffer buffer) const override;