From 1ea01c4449d9149ffa882278077def059bec55ea Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Mon, 26 Feb 2024 12:39:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
=?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?=
=?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F=20LogLevel=20=D0=BD=D0=B0=20Level=20?=
=?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?=
=?UTF-8?q?=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BB=D0=BE=D0=B3?=
=?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
logs/log.go | 8 ++++----
logs/log_test.go | 2 +-
logs/zap/core.go | 2 +-
logs/zap/core_test.go | 2 +-
logs/zap/example_test.go | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/logs/log.go b/logs/log.go
index 2bc9dedf..407cfbdb 100644
--- a/logs/log.go
+++ b/logs/log.go
@@ -29,7 +29,7 @@ func (l Level) String() string {
type Entry struct {
ID string `json:"id" bson:"id" mapstructure:"id"`
Timestamp time.Time `json:"timestamp,omitempty" bson:"timestamp,omitempty" mapstructure:"timestamp,omitempty"`
- LogLevel Level `json:"log_level,omitempty" bson:"log_level,omitempty" mapstructure:"log_level,omitempty"`
+ Level Level `json:"level,omitempty" bson:"level,omitempty" mapstructure:"level,omitempty"`
Message string `json:"message,omitempty" bson:"message,omitempty" mapstructure:"message,omitempty"`
Category string `json:"category,omitempty" bson:"category,omitempty" mapstructure:"category,omitempty"`
Component string `json:"component,omitempty" bson:"component,omitempty" mapstructure:"component,omitempty"`
@@ -54,7 +54,7 @@ func EntryToPB(entry *Entry) *pb.LogEntry {
logEntry := &pb.LogEntry{
Id: entry.ID,
Timestamp: timestamppb.New(entry.Timestamp),
- Level: pb.LogLevel(entry.LogLevel),
+ Level: pb.LogLevel(entry.Level),
Message: entry.Message,
Category: entry.Category,
Component: entry.Component,
@@ -76,7 +76,7 @@ func EntryFromPB(request *pb.LogEntry) *Entry {
logEntry := &Entry{
ID: request.Id,
Timestamp: request.Timestamp.AsTime(),
- LogLevel: Level(request.Level),
+ Level: Level(request.Level),
Message: request.Message,
Category: request.Category,
Component: request.Component,
@@ -103,7 +103,7 @@ func (e *Entry) ToMap() map[string]any {
res := map[string]any{
"id": e.ID,
"timestamp": e.Timestamp,
- "log_level": e.LogLevel,
+ "log_level": e.Level,
"message": e.Message,
"category": e.Category,
"component": e.Component,
diff --git a/logs/log_test.go b/logs/log_test.go
index 9ccb7e70..3e86d4a8 100644
--- a/logs/log_test.go
+++ b/logs/log_test.go
@@ -50,7 +50,7 @@ func TestEntry_ToMap(t *testing.T) {
e := &Entry{
ID: tt.fields.ID,
Timestamp: tt.fields.Timestamp,
- LogLevel: tt.fields.LogLevel,
+ Level: tt.fields.LogLevel,
Message: tt.fields.Message,
Category: tt.fields.Category,
Component: tt.fields.Component,
diff --git a/logs/zap/core.go b/logs/zap/core.go
index 3b0c3305..482cb859 100644
--- a/logs/zap/core.go
+++ b/logs/zap/core.go
@@ -67,7 +67,7 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *logs.En
ent := &logs.Entry{
ID: id.GenerateNewID(),
Timestamp: entry.Time,
- LogLevel: logs.Level(entry.Level),
+ Level: logs.Level(entry.Level),
Message: entry.Message,
}
diff --git a/logs/zap/core_test.go b/logs/zap/core_test.go
index aabe9cea..360e850a 100644
--- a/logs/zap/core_test.go
+++ b/logs/zap/core_test.go
@@ -41,7 +41,7 @@ func TestCore_getEntry(t *testing.T) {
},
},
want: &logs.Entry{
- LogLevel: logs.Level(zapcore.InfoLevel),
+ Level: logs.Level(zapcore.InfoLevel),
Message: "создан элемент коллекции",
Category: "create",
Component: "Items.Service",
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index 9dfd0aaa..e0db8954 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -26,7 +26,7 @@ func TestExample(t *testing.T) {
wantEntries := []*logs.Entry{
{
- LogLevel: logs.Level(zapcore.InfoLevel),
+ Level: logs.Level(zapcore.InfoLevel),
Message: "Successfully created",
Component: "Items",
Event: items.EventCreateItem,
@@ -35,7 +35,7 @@ func TestExample(t *testing.T) {
Tags: []string{"tag1", "tag2", "tag3"},
},
{
- LogLevel: logs.Level(zapcore.WarnLevel),
+ Level: logs.Level(zapcore.WarnLevel),
Message: "Successfully updated",
Component: "Items",
Event: items.EventUpdateItem,
--
GitLab