From cb2f77c0f81a4ebe605176ccba7e1774a1574ad1 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <ensiouel@gmail.com>
Date: Wed, 14 Feb 2024 18:49:33 +0300
Subject: [PATCH] refactor
---
{pkg/log => log}/zap/buffered_write_syncer.go | 2 +-
{pkg/log => log}/zap/buffered_write_syncer_test.go | 0
{pkg/log => log}/zap/core.go | 7 ++++---
{pkg/log => log}/zap/core_test.go | 6 +++---
{pkg/log => log}/zap/example_test.go | 12 ++++++------
{pkg/log => log}/zap/field.go | 0
6 files changed, 14 insertions(+), 13 deletions(-)
rename {pkg/log => log}/zap/buffered_write_syncer.go (99%)
rename {pkg/log => log}/zap/buffered_write_syncer_test.go (100%)
rename {pkg/log => log}/zap/core.go (91%)
rename {pkg/log => log}/zap/core_test.go (91%)
rename {pkg/log => log}/zap/example_test.go (90%)
rename {pkg/log => log}/zap/field.go (100%)
diff --git a/pkg/log/zap/buffered_write_syncer.go b/log/zap/buffered_write_syncer.go
similarity index 99%
rename from pkg/log/zap/buffered_write_syncer.go
rename to log/zap/buffered_write_syncer.go
index 7ded0afa..6e2edc6f 100644
--- a/pkg/log/zap/buffered_write_syncer.go
+++ b/log/zap/buffered_write_syncer.go
@@ -5,8 +5,8 @@ import (
"sync"
"time"
+ "git.perx.ru/perxis/perxis-go/log"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/log"
)
const (
diff --git a/pkg/log/zap/buffered_write_syncer_test.go b/log/zap/buffered_write_syncer_test.go
similarity index 100%
rename from pkg/log/zap/buffered_write_syncer_test.go
rename to log/zap/buffered_write_syncer_test.go
diff --git a/pkg/log/zap/core.go b/log/zap/core.go
similarity index 91%
rename from pkg/log/zap/core.go
rename to log/zap/core.go
index cf925e92..f2b220ea 100644
--- a/pkg/log/zap/core.go
+++ b/log/zap/core.go
@@ -1,8 +1,9 @@
package zap
import (
+ oid "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/log"
"git.perx.ru/perxis/perxis-go/pkg/id"
- "git.perx.ru/perxis/perxis-go/pkg/log"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
@@ -71,8 +72,8 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *log.Ent
ent.Category, _ = enc.Fields["category"].(string)
ent.Component, _ = enc.Fields["component"].(string)
ent.Event, _ = enc.Fields["event"].(string)
- ent.Object, _ = enc.Fields["object"].(string)
- ent.Caller, _ = enc.Fields["caller"].(string)
+ ent.ObjectID, _ = enc.Fields["object"].(*oid.ObjectId)
+ ent.CallerID, _ = enc.Fields["caller"].(*oid.ObjectId)
ent.Attr = enc.Fields["attr"]
if tags, ok := enc.Fields["tags"].([]any); ok {
diff --git a/pkg/log/zap/core_test.go b/log/zap/core_test.go
similarity index 91%
rename from pkg/log/zap/core_test.go
rename to log/zap/core_test.go
index 8378658e..4147dc3e 100644
--- a/pkg/log/zap/core_test.go
+++ b/log/zap/core_test.go
@@ -3,7 +3,7 @@ package zap
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/log"
+ "git.perx.ru/perxis/perxis-go/log"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
@@ -44,8 +44,8 @@ func TestCore_getEntry(t *testing.T) {
Category: "create",
Component: "Items.Service",
Event: "Items.Create",
- Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
- Caller: "/users/PHVz",
+ ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
+ CallerID: "/users/PHVz",
Attr: "any",
Tags: []string{"tag1", "tag2", "tag3"},
},
diff --git a/pkg/log/zap/example_test.go b/log/zap/example_test.go
similarity index 90%
rename from pkg/log/zap/example_test.go
rename to log/zap/example_test.go
index 3b0d81d9..a8918b6b 100644
--- a/pkg/log/zap/example_test.go
+++ b/log/zap/example_test.go
@@ -6,10 +6,10 @@ import (
"slices"
"testing"
+ "git.perx.ru/perxis/perxis-go/log"
+ logmocks "git.perx.ru/perxis/perxis-go/log/mocks"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/log"
- logmocks "git.perx.ru/perxis/perxis-go/pkg/log/mocks"
"git.perx.ru/perxis/perxis-go/pkg/users"
usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
"github.com/stretchr/testify/mock"
@@ -25,8 +25,8 @@ func TestExample(t *testing.T) {
Message: "Successfully created",
Component: "Items",
Event: items.EventCreateItem,
- Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
- Caller: "/users/294de355",
+ ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
+ CallerID: "/users/294de355",
Tags: []string{"tag1", "tag2", "tag3"},
},
{
@@ -34,8 +34,8 @@ func TestExample(t *testing.T) {
Message: "Successfully updated",
Component: "Items",
Event: items.EventUpdateItem,
- Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/cmV2cw",
- Caller: "/users/294de355",
+ ObjectID: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/cmV2cw",
+ CallerID: "/users/294de355",
Attr: map[string]map[string]any{"title": {"old": "old title", "new": "new title"}},
},
}
diff --git a/pkg/log/zap/field.go b/log/zap/field.go
similarity index 100%
rename from pkg/log/zap/field.go
rename to log/zap/field.go
--
GitLab