diff options
| author | Aleksey Kosov <rusyak777@list.ru> | 2025-06-24 18:44:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-24 08:44:06 -0700 |
| commit | 4511c2cc1f0aef4f0df8712f17dc62606a9949e0 (patch) | |
| tree | 0b82709d104ae8882acd14f5047d020df9375524 /weed/pb | |
| parent | 2cdd8092cc57cb828e92588d5f09f594bcc82f26 (diff) | |
| download | seaweedfs-4511c2cc1f0aef4f0df8712f17dc62606a9949e0.tar.xz seaweedfs-4511c2cc1f0aef4f0df8712f17dc62606a9949e0.zip | |
Changes logging function (#6919)
* updated logging methods for stores
* updated logging methods for stores
* updated logging methods for filer
* updated logging methods for uploader and http_util
* updated logging methods for weed server
---------
Co-authored-by: akosov <a.kosov@kryptonite.ru>
Diffstat (limited to 'weed/pb')
| -rw-r--r-- | weed/pb/filer_pb/filer_client.go | 20 | ||||
| -rw-r--r-- | weed/pb/filer_pb/filer_pb_helper.go | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/weed/pb/filer_pb/filer_client.go b/weed/pb/filer_pb/filer_client.go index 60a7c637c..80adab292 100644 --- a/weed/pb/filer_pb/filer_client.go +++ b/weed/pb/filer_pb/filer_client.go @@ -39,7 +39,7 @@ func GetEntry(ctx context.Context, filerClient FilerClient, fullFilePath util.Fu // glog.V(3).Infof("read %s request: %v", fullFilePath, request) resp, err := LookupEntry(ctx, client, request) if err != nil { - glog.V(3).Infof("read %s %v: %v", fullFilePath, resp, err) + glog.V(3).InfofCtx(ctx, "read %s %v: %v", fullFilePath, resp, err) return err } @@ -117,7 +117,7 @@ func doSeaweedList(ctx context.Context, client SeaweedFilerClient, fullDirPath u InclusiveStartFrom: inclusive, } - glog.V(4).Infof("read directory: %v", request) + glog.V(4).InfofCtx(ctx, "read directory: %v", request) ctx, cancel := context.WithCancel(ctx) defer cancel() stream, err := client.ListEntries(ctx, request) @@ -165,14 +165,14 @@ func Exists(ctx context.Context, filerClient FilerClient, parentDirectoryPath st Name: entryName, } - glog.V(4).Infof("exists entry %v/%v: %v", parentDirectoryPath, entryName, request) + glog.V(4).InfofCtx(ctx, "exists entry %v/%v: %v", parentDirectoryPath, entryName, request) resp, err := LookupEntry(ctx, client, request) if err != nil { if err == ErrNotFound { exists = false return nil } - glog.V(0).Infof("exists entry %v: %v", request, err) + glog.V(0).InfofCtx(ctx, "exists entry %v: %v", request, err) return fmt.Errorf("exists entry %s/%s: %v", parentDirectoryPath, entryName, err) } @@ -193,9 +193,9 @@ func Touch(ctx context.Context, filerClient FilerClient, parentDirectoryPath str Entry: entry, } - glog.V(4).Infof("touch entry %v/%v: %v", parentDirectoryPath, entryName, request) + glog.V(4).InfofCtx(ctx, "touch entry %v/%v: %v", parentDirectoryPath, entryName, request) if err := UpdateEntry(ctx, client, request); err != nil { - glog.V(0).Infof("touch exists entry %v: %v", request, err) + glog.V(0).InfofCtx(ctx, "touch exists entry %v: %v", request, err) return fmt.Errorf("touch exists entry %s/%s: %v", parentDirectoryPath, entryName, err) } @@ -232,9 +232,9 @@ func DoMkdir(ctx context.Context, client SeaweedFilerClient, parentDirectoryPath Entry: entry, } - glog.V(1).Infof("mkdir: %v", request) + glog.V(1).InfofCtx(ctx, "mkdir: %v", request) if err := CreateEntry(ctx, client, request); err != nil { - glog.V(0).Infof("mkdir %v: %v", request, err) + glog.V(0).InfofCtx(ctx, "mkdir %v: %v", request, err) return fmt.Errorf("mkdir %s/%s: %v", parentDirectoryPath, dirName, err) } @@ -266,9 +266,9 @@ func MkFile(ctx context.Context, filerClient FilerClient, parentDirectoryPath st Entry: entry, } - glog.V(1).Infof("create file: %s/%s", parentDirectoryPath, fileName) + glog.V(1).InfofCtx(ctx, "create file: %s/%s", parentDirectoryPath, fileName) if err := CreateEntry(ctx, client, request); err != nil { - glog.V(0).Infof("create file %v:%v", request, err) + glog.V(0).InfofCtx(ctx, "create file %v:%v", request, err) return fmt.Errorf("create file %s/%s: %v", parentDirectoryPath, fileName, err) } diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index b45d999ad..c212100d9 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -111,11 +111,11 @@ func AfterEntryDeserialization(chunks []*FileChunk) { func CreateEntry(ctx context.Context, client SeaweedFilerClient, request *CreateEntryRequest) error { resp, err := client.CreateEntry(ctx, request) if err != nil { - glog.V(1).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, err) + glog.V(1).InfofCtx(ctx, "create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, err) return fmt.Errorf("CreateEntry: %v", err) } if resp.Error != "" { - glog.V(1).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, resp.Error) + glog.V(1).InfofCtx(ctx, "create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, resp.Error) return fmt.Errorf("CreateEntry : %v", resp.Error) } return nil @@ -124,7 +124,7 @@ func CreateEntry(ctx context.Context, client SeaweedFilerClient, request *Create func UpdateEntry(ctx context.Context, client SeaweedFilerClient, request *UpdateEntryRequest) error { _, err := client.UpdateEntry(ctx, request) if err != nil { - glog.V(1).Infof("update entry %s/%s :%v", request.Directory, request.Entry.Name, err) + glog.V(1).InfofCtx(ctx, "update entry %s/%s :%v", request.Directory, request.Entry.Name, err) return fmt.Errorf("UpdateEntry: %v", err) } return nil @@ -136,7 +136,7 @@ func LookupEntry(ctx context.Context, client SeaweedFilerClient, request *Lookup if err == ErrNotFound || strings.Contains(err.Error(), ErrNotFound.Error()) { return nil, ErrNotFound } - glog.V(3).Infof("read %s/%v: %v", request.Directory, request.Name, err) + glog.V(3).InfofCtx(ctx, "read %s/%v: %v", request.Directory, request.Name, err) return nil, fmt.Errorf("LookupEntry1: %v", err) } if resp.Entry == nil { |
