PenaSide/common
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

change logger

Browse Source
This commit is contained in:
Pavel 2023-12-01 23:42:12 +03:00
parent f1232c1893
commit cec2405fe2
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -7,4 +7,8 @@ require (
github.com/sirupsen/logrus v1.9.3
)
require golang.org/x/sys v0.14.0 // indirect
require (
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/sys v0.14.0 // indirect
)

4
go.sum
View File

@ -10,6 +10,10 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

18
privilege/controller/privilege.go
View File

@ -5,18 +5,18 @@ import (
"context"
"encoding/json"
"errors"
"github.com/sirupsen/logrus"
"go.uber.org/zap"
"io"
"net/http"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/privilege/config"
)
type Deps struct {
Logger *logrus.Logger
Logger *zap.Logger
}
type Handler struct {
logger *logrus.Logger
logger *zap.Logger
}
func NewPrivilegeHandler(deps *Deps) *Handler {
@ -28,7 +28,7 @@ func NewPrivilegeHandler(deps *Deps) *Handler {
func (handler *Handler) GetPrivilege(ctx context.Context, url string) ([]config.Privilege, error) {
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
handler.logger.Errorf("failed to create GET request: %v", err)
handler.logger.Error("failed to create GET request: %v")
return nil, err
}
@ -38,13 +38,13 @@ func (handler *Handler) GetPrivilege(ctx context.Context, url string) ([]config.
func (handler *Handler) PostPrivilege(ctx context.Context, data []config.Privilege, url string) ([]config.Privilege, error) {
payload, err := json.Marshal(data)
if err != nil {
handler.logger.Errorf("failed to marshal request body: %v", err)
handler.logger.Error("failed to marshal request body: %v")
return nil, err
}
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer(payload))
if err != nil {
handler.logger.Errorf("failed to create POST request: %v", err)
handler.logger.Error("failed to create POST request: %v")
return nil, err
}
req.Header.Set("Content-Type", "application/json")
@ -55,7 +55,7 @@ func (handler *Handler) PostPrivilege(ctx context.Context, data []config.Privile
func (handler *Handler) doRequest(req *http.Request) ([]config.Privilege, error) {
response, err := http.DefaultClient.Do(req)
if err != nil {
handler.logger.Errorf("failed to perform HTTP request: %v", err)
handler.logger.Error("failed to perform HTTP request: %v")
return nil, err
}
defer response.Body.Close()
@ -66,13 +66,13 @@ func (handler *Handler) doRequest(req *http.Request) ([]config.Privilege, error)
var buffer bytes.Buffer
if _, err := io.Copy(&buffer, response.Body); err != nil {
handler.logger.Errorf("failed to read response body: %v", err)
handler.logger.Error("failed to read response body: %v")
return nil, err
}
var privileges []config.Privilege
if err := json.Unmarshal(buffer.Bytes(), &privileges); err != nil {
handler.logger.Errorf("failed to unmarshal response body: %v", err)
handler.logger.Error("failed to unmarshal response body: %v")
return nil, err
}