Skip to content

Commit 4f7569b

Browse files
efirsefirs
committed
fix: Unified logging
1 parent 4c43f9b commit 4f7569b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+992
-762
lines changed

‎core/aws_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (s *S3BucketEventualConsistency) Init(key string) (err error) {
8686
for i := 0; i < 10; i++ {
8787
err = s.S3Backend.Init(key)
8888
if err != nil && err.Error() == NoSuchBucket {
89-
s3Log.Infof("waiting for bucket")
89+
s3Log.Info().Msg("waiting for bucket")
9090
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
9191
} else {
9292
return
@@ -104,15 +104,15 @@ func (s *S3BucketEventualConsistency) HeadBlob(param *HeadBlobInput) (*HeadBlobO
104104
res, err = s.S3Backend.HeadBlob(param)
105105
switch mapAwsError(err) {
106106
case syscall.ENXIO:
107-
s3Log.Infof("waiting for bucket")
107+
s3Log.Info().Msg("waiting for bucket")
108108
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
109109
case syscall.ENOENT:
110110
s.mu.RLock()
111111
_, ok := s.blobs[param.Key]
112112
s.mu.RUnlock()
113113

114114
if ok {
115-
s3Log.Infof("waiting for blob: %v", param.Key)
115+
s3Log.Info().Str("blob", param.Key).Msg("waiting for blob")
116116
time.Sleep((time.Duration(i) + 1) * 20 * time.Millisecond)
117117
}
118118
default:
@@ -128,7 +128,7 @@ func (s *S3BucketEventualConsistency) ListBlobs(param *ListBlobsInput) (*ListBlo
128128
res, err := s.S3Backend.ListBlobs(param)
129129
switch mapAwsError(err) {
130130
case syscall.ENXIO:
131-
s3Log.Infof("waiting for bucket")
131+
s3Log.Info().Msg("waiting for bucket")
132132
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
133133
default:
134134
return res, err
@@ -143,7 +143,7 @@ func (s *S3BucketEventualConsistency) DeleteBlob(param *DeleteBlobInput) (*Delet
143143
res, err := s.S3Backend.DeleteBlob(param)
144144
switch mapAwsError(err) {
145145
case syscall.ENXIO:
146-
s3Log.Infof("waiting for bucket")
146+
s3Log.Info().Msg("waiting for bucket")
147147
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
148148
default:
149149
return res, err
@@ -158,7 +158,7 @@ func (s *S3BucketEventualConsistency) DeleteBlobs(param *DeleteBlobsInput) (*Del
158158
res, err := s.S3Backend.DeleteBlobs(param)
159159
switch mapAwsError(err) {
160160
case syscall.ENXIO:
161-
s3Log.Infof("waiting for bucket")
161+
s3Log.Info().Msg("waiting for bucket")
162162
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
163163
default:
164164
return res, err
@@ -173,7 +173,7 @@ func (s *S3BucketEventualConsistency) CopyBlob(param *CopyBlobInput) (*CopyBlobO
173173
res, err := s.S3Backend.CopyBlob(param)
174174
switch mapAwsError(err) {
175175
case syscall.ENXIO:
176-
s3Log.Infof("waiting for bucket")
176+
s3Log.Info().Msg("waiting for bucket")
177177
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
178178
default:
179179
return res, err
@@ -193,7 +193,7 @@ func (s *S3BucketEventualConsistency) PutBlob(param *PutBlobInput) (*PutBlobOutp
193193
switch mapAwsError(err) {
194194
case syscall.ENXIO:
195195
param.Body.Seek(0, 0)
196-
s3Log.Infof("waiting for bucket")
196+
s3Log.Info().Msg("waiting for bucket")
197197
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
198198
default:
199199
return res, err
@@ -208,7 +208,7 @@ func (s *S3BucketEventualConsistency) RemoveBucket(param *RemoveBucketInput) (*R
208208
res, err := s.S3Backend.RemoveBucket(param)
209209
switch mapAwsError(err) {
210210
case syscall.ENXIO:
211-
s3Log.Infof("waiting for bucket")
211+
s3Log.Info().Msg("waiting for bucket")
212212
time.Sleep((time.Duration(i) + 1) * 2 * time.Second)
213213
default:
214214
return res, err

‎core/backend.go‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package core
1818
import (
1919
"fmt"
2020
"io"
21-
"io/ioutil"
2221
"strings"
2322
"sync"
2423
"syscall"
@@ -342,7 +341,7 @@ func (s *StorageBackendInitWrapper) Init(key string) error {
342341
s.init.Do(func() {
343342
s.initErr = s.StorageBackend.Init(s.initKey)
344343
if s.initErr != nil {
345-
log.Errorf("%T Init: %v", s.StorageBackend, s.initErr)
344+
mainLog.Error().Err(s.initErr).Str("storage_backend", fmt.Sprintf("%T", s.StorageBackend)).Msg("Init error")
346345
s.StorageBackend = StorageBackendInitError{
347346
s.initErr,
348347
*s.StorageBackend.Capabilities(),
@@ -361,87 +360,87 @@ func (s *StorageBackendInitWrapper) Bucket() string {
361360
}
362361

363362
func (s *StorageBackendInitWrapper) HeadBlob(param *HeadBlobInput) (*HeadBlobOutput, error) {
364-
s.Init("")
363+
mainLog.E(s.Init(""))
365364
return s.StorageBackend.HeadBlob(param)
366365
}
367366

368367
func (s *StorageBackendInitWrapper) ListBlobs(param *ListBlobsInput) (*ListBlobsOutput, error) {
369-
s.Init("")
368+
mainLog.E(s.Init(""))
370369
return s.StorageBackend.ListBlobs(param)
371370
}
372371

373372
func (s *StorageBackendInitWrapper) DeleteBlob(param *DeleteBlobInput) (*DeleteBlobOutput, error) {
374-
s.Init("")
373+
mainLog.E(s.Init(""))
375374
return s.StorageBackend.DeleteBlob(param)
376375
}
377376

378377
func (s *StorageBackendInitWrapper) DeleteBlobs(param *DeleteBlobsInput) (*DeleteBlobsOutput, error) {
379-
s.Init("")
378+
mainLog.E(s.Init(""))
380379
return s.StorageBackend.DeleteBlobs(param)
381380
}
382381

383382
func (s *StorageBackendInitWrapper) RenameBlob(param *RenameBlobInput) (*RenameBlobOutput, error) {
384-
s.Init("")
383+
mainLog.E(s.Init(""))
385384
return s.StorageBackend.RenameBlob(param)
386385
}
387386

388387
func (s *StorageBackendInitWrapper) CopyBlob(param *CopyBlobInput) (*CopyBlobOutput, error) {
389-
s.Init("")
388+
mainLog.E(s.Init(""))
390389
return s.StorageBackend.CopyBlob(param)
391390
}
392391

393392
func (s *StorageBackendInitWrapper) GetBlob(param *GetBlobInput) (*GetBlobOutput, error) {
394-
s.Init("")
393+
mainLog.E(s.Init(""))
395394
return s.StorageBackend.GetBlob(param)
396395
}
397396

398397
func (s *StorageBackendInitWrapper) PutBlob(param *PutBlobInput) (*PutBlobOutput, error) {
399-
s.Init("")
398+
mainLog.E(s.Init(""))
400399
return s.StorageBackend.PutBlob(param)
401400
}
402401

403402
func (s *StorageBackendInitWrapper) PatchBlob(param *PatchBlobInput) (*PatchBlobOutput, error) {
404-
s.Init("")
403+
mainLog.E(s.Init(""))
405404
return s.StorageBackend.PatchBlob(param)
406405
}
407406

408407
func (s *StorageBackendInitWrapper) MultipartBlobBegin(param *MultipartBlobBeginInput) (*MultipartBlobCommitInput, error) {
409-
s.Init("")
408+
mainLog.E(s.Init(""))
410409
return s.StorageBackend.MultipartBlobBegin(param)
411410
}
412411

413412
func (s *StorageBackendInitWrapper) MultipartBlobAdd(param *MultipartBlobAddInput) (*MultipartBlobAddOutput, error) {
414-
s.Init("")
413+
mainLog.E(s.Init(""))
415414
return s.StorageBackend.MultipartBlobAdd(param)
416415
}
417416

418417
func (s *StorageBackendInitWrapper) MultipartBlobCopy(param *MultipartBlobCopyInput) (*MultipartBlobCopyOutput, error) {
419-
s.Init("")
418+
mainLog.E(s.Init(""))
420419
return s.StorageBackend.MultipartBlobCopy(param)
421420
}
422421

423422
func (s *StorageBackendInitWrapper) MultipartBlobAbort(param *MultipartBlobCommitInput) (*MultipartBlobAbortOutput, error) {
424-
s.Init("")
423+
mainLog.E(s.Init(""))
425424
return s.StorageBackend.MultipartBlobAbort(param)
426425
}
427426

428427
func (s *StorageBackendInitWrapper) MultipartBlobCommit(param *MultipartBlobCommitInput) (*MultipartBlobCommitOutput, error) {
429-
s.Init("")
428+
mainLog.E(s.Init(""))
430429
return s.StorageBackend.MultipartBlobCommit(param)
431430
}
432431

433432
func (s *StorageBackendInitWrapper) MultipartExpire(param *MultipartExpireInput) (*MultipartExpireOutput, error) {
434-
s.Init("")
433+
mainLog.E(s.Init(""))
435434
return s.StorageBackend.MultipartExpire(param)
436435
}
437436

438437
func (s *StorageBackendInitWrapper) RemoveBucket(param *RemoveBucketInput) (*RemoveBucketOutput, error) {
439-
s.Init("")
438+
mainLog.E(s.Init(""))
440439
return s.StorageBackend.RemoveBucket(param)
441440
}
442441

443442
func (s *StorageBackendInitWrapper) MakeBucket(param *MakeBucketInput) (*MakeBucketOutput, error) {
444-
s.Init("")
443+
mainLog.E(s.Init(""))
445444
return s.StorageBackend.MakeBucket(param)
446445
}
447446

@@ -526,7 +525,7 @@ func (e StorageBackendInitError) GetBlob(param *GetBlobInput) (*GetBlobOutput, e
526525
},
527526
ContentType: PString("text/plain"),
528527
},
529-
Body: ioutil.NopCloser(strings.NewReader(errStr)),
528+
Body: io.NopCloser(strings.NewReader(errStr)),
530529
}, nil
531530
} else {
532531
return nil, syscall.ENOENT

‎core/backend_adlv1.go‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
package core
1717

1818
import (
19+
"github.com/rs/zerolog"
1920
"github.com/yandex-cloud/geesefs/core/cfg"
21+
"github.com/yandex-cloud/geesefs/log"
2022

2123
"bytes"
2224
"context"
@@ -28,11 +30,9 @@ import (
2830
"syscall"
2931
"time"
3032

31-
uuid "github.com/gofrs/uuid"
32-
"github.com/sirupsen/logrus"
33-
3433
adl "github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem"
3534
"github.com/Azure/go-autorest/autorest"
35+
uuid "github.com/gofrs/uuid"
3636
)
3737

3838
type ADLv1 struct {
@@ -66,7 +66,7 @@ func (err ADLv1Err) Error() string {
6666

6767
const ADL1_REQUEST_ID = "X-Ms-Request-Id"
6868

69-
var adls1Log = cfg.GetLogger("adlv1")
69+
var adls1Log = log.GetLogger("adlv1")
7070

7171
type ADLv1MultipartBlobCommitInput struct {
7272
Size uint64
@@ -77,14 +77,12 @@ func IsADLv1Endpoint(endpoint string) bool {
7777
//return strings.HasSuffix(endpoint, ".azuredatalakestore.net")
7878
}
7979

80-
func adlLogResp(level logrus.Level, r *http.Response) {
81-
if adls1Log.IsLevelEnabled(level) {
82-
op := r.Request.URL.Query().Get("op")
83-
requestId := r.Request.Header.Get(ADL1_REQUEST_ID)
84-
respId := r.Header.Get(ADL1_REQUEST_ID)
85-
adls1Log.Logf(level, "%v %v %v %v %v", op, r.Request.URL.String(),
86-
requestId, r.Status, respId)
87-
}
80+
func adlLogResp(level zerolog.Level, r *http.Response) {
81+
op := r.Request.URL.Query().Get("op")
82+
requestId := r.Request.Header.Get(ADL1_REQUEST_ID)
83+
respId := r.Header.Get(ADL1_REQUEST_ID)
84+
adls1Log.Debug().Msgf("%v %v %v %v %v", op, r.Request.URL.String(),
85+
requestId, r.Status, respId)
8886
}
8987

9088
func NewADLv1(bucket string, flags *cfg.FlagStorage, config *cfg.ADLv1Config) (*ADLv1, error) {
@@ -111,26 +109,26 @@ func NewADLv1(bucket string, flags *cfg.FlagStorage, config *cfg.ADLv1Config) (*
111109
u, _ := uuid.NewV4()
112110
r.Header.Add(ADL1_REQUEST_ID, u.String())
113111

114-
if adls1Log.IsLevelEnabled(logrus.DebugLevel) {
112+
if adls1Log.GetLevel() <= zerolog.DebugLevel {
115113
op := r.URL.Query().Get("op")
116114
requestId := r.Header.Get(ADL1_REQUEST_ID)
117-
adls1Log.Debugf("%v %v %v", op, r.URL.String(), requestId)
115+
adls1Log.Debug().Str("operation", op).Str("url", r.URL.String()).Str("requestId", requestId).Msg("Debug log")
118116
}
119117

120118
r, err := p.Prepare(r)
121119
if err != nil {
122-
log.Error(err)
120+
adls1Log.Error().Err(err).Msg("Error in LogRequest")
123121
}
124122
return r, err
125123
})
126124
}
127125

128126
LogResponse := func(p autorest.Responder) autorest.Responder {
129127
return autorest.ResponderFunc(func(r *http.Response) error {
130-
adlLogResp(logrus.DebugLevel, r)
128+
adlLogResp(zerolog.DebugLevel, r)
131129
err := p.Respond(r)
132130
if err != nil {
133-
log.Error(err)
131+
adls1Log.Error().Err(err).Msg("Error in LogResponse")
134132
}
135133
return err
136134
})
@@ -196,15 +194,15 @@ func mapADLv1Error(resp *http.Response, err error, rawError bool) error {
196194
adlErr.resp = resp
197195
return adlErr
198196
} else {
199-
adls1Log.Errorf("cannot parse error: %v", err)
197+
adls1Log.Error().Err(err).Msg("Cannot parse error")
200198
return syscall.EAGAIN
201199
}
202200
} else {
203201
err = mapHttpError(resp.StatusCode)
204202
if err != nil {
205203
return err
206204
} else {
207-
adlLogResp(logrus.ErrorLevel, resp)
205+
adlLogResp(zerolog.ErrorLevel, resp)
208206
return syscall.EINVAL
209207
}
210208
}

0 commit comments

Comments
 (0)