diff options
Diffstat (limited to 'weed/filer/redis3')
| -rw-r--r-- | weed/filer/redis3/item_list_serde.go | 6 | ||||
| -rw-r--r-- | weed/filer/redis3/kv_directory_children.go | 6 | ||||
| -rw-r--r-- | weed/filer/redis3/redis_store.go | 10 | ||||
| -rw-r--r-- | weed/filer/redis3/skiplist_element_store.go | 4 | ||||
| -rw-r--r-- | weed/filer/redis3/universal_redis_store.go | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/weed/filer/redis3/item_list_serde.go b/weed/filer/redis3/item_list_serde.go index f4410b61b..f394c7004 100644 --- a/weed/filer/redis3/item_list_serde.go +++ b/weed/filer/redis3/item_list_serde.go @@ -2,7 +2,7 @@ package redis3 import ( "github.com/redis/go-redis/v9" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/util/skiplist" "google.golang.org/protobuf/proto" ) @@ -22,7 +22,7 @@ func LoadItemList(data []byte, prefix string, client redis.UniversalClient, stor message := &skiplist.SkipListProto{} if err := proto.Unmarshal(data, message); err != nil { - glog.Errorf("loading skiplist: %v", err) + log.Errorf("loading skiplist: %v", err) } nl.skipList.MaxNewLevel = int(message.MaxNewLevel) nl.skipList.MaxLevel = int(message.MaxLevel) @@ -69,7 +69,7 @@ func (nl *ItemList) ToBytes() []byte { } data, err := proto.Marshal(message) if err != nil { - glog.Errorf("marshal skiplist: %v", err) + log.Errorf("marshal skiplist: %v", err) } return data } diff --git a/weed/filer/redis3/kv_directory_children.go b/weed/filer/redis3/kv_directory_children.go index 5a2d76141..9738b80c4 100644 --- a/weed/filer/redis3/kv_directory_children.go +++ b/weed/filer/redis3/kv_directory_children.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "github.com/redis/go-redis/v9" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" ) const maxNameBatchSizeLimit = 1000000 @@ -31,7 +31,7 @@ func insertChild(ctx context.Context, redisStore *UniversalRedis3Store, key stri nameList := LoadItemList([]byte(data), key, client, store, maxNameBatchSizeLimit) if err := nameList.WriteName(name); err != nil { - glog.Errorf("add %s %s: %v", key, name, err) + log.Errorf("add %s %s: %v", key, name, err) return err } @@ -100,7 +100,7 @@ func removeChildren(ctx context.Context, redisStore *UniversalRedis3Store, key s if err = nameList.ListNames("", func(name string) bool { if err := onDeleteFn(name); err != nil { - glog.Errorf("delete %s child %s: %v", key, name, err) + log.Errorf("delete %s child %s: %v", key, name, err) return false } return true diff --git a/weed/filer/redis3/redis_store.go b/weed/filer/redis3/redis_store.go index 3bb0ce46f..d5c4f9b87 100644 --- a/weed/filer/redis3/redis_store.go +++ b/weed/filer/redis3/redis_store.go @@ -10,7 +10,7 @@ import ( "github.com/go-redsync/redsync/v4/redis/goredis/v9" "github.com/redis/go-redis/v9" "github.com/seaweedfs/seaweedfs/weed/filer" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/util" ) @@ -42,22 +42,22 @@ func (store *Redis3Store) initialize(hostPort string, password string, database if enableMtls { clientCert, err := tls.LoadX509KeyPair(clientCertPath, clientKeyPath) if err != nil { - glog.Fatalf("Error loading client certificate and key pair: %v", err) + log.Fatalf("Error loading client certificate and key pair: %v", err) } caCertBytes, err := os.ReadFile(caCertPath) if err != nil { - glog.Fatalf("Error reading CA certificate file: %v", err) + log.Fatalf("Error reading CA certificate file: %v", err) } caCertPool := x509.NewCertPool() if ok := caCertPool.AppendCertsFromPEM(caCertBytes); !ok { - glog.Fatalf("Error appending CA certificate to pool") + log.Fatalf("Error appending CA certificate to pool") } redisHost, _, err := net.SplitHostPort(hostPort) if err != nil { - glog.Fatalf("Error parsing redis host and port from %s: %v", hostPort, err) + log.Fatalf("Error parsing redis host and port from %s: %v", hostPort, err) } tlsConfig := &tls.Config{ diff --git a/weed/filer/redis3/skiplist_element_store.go b/weed/filer/redis3/skiplist_element_store.go index 46506187e..551aa463d 100644 --- a/weed/filer/redis3/skiplist_element_store.go +++ b/weed/filer/redis3/skiplist_element_store.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "github.com/redis/go-redis/v9" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/util/skiplist" "google.golang.org/protobuf/proto" ) @@ -27,7 +27,7 @@ func (m *SkipListElementStore) SaveElement(id int64, element *skiplist.SkipListE key := fmt.Sprintf("%s%d", m.Prefix, id) data, err := proto.Marshal(element) if err != nil { - glog.Errorf("marshal %s: %v", key, err) + log.Errorf("marshal %s: %v", key, err) } return m.client.Set(context.Background(), key, data, 0).Err() } diff --git a/weed/filer/redis3/universal_redis_store.go b/weed/filer/redis3/universal_redis_store.go index 51675d971..c0d0ef7af 100644 --- a/weed/filer/redis3/universal_redis_store.go +++ b/weed/filer/redis3/universal_redis_store.go @@ -9,7 +9,7 @@ import ( redsync "github.com/go-redsync/redsync/v4" "github.com/seaweedfs/seaweedfs/weed/filer" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" ) @@ -151,7 +151,7 @@ func (store *UniversalRedis3Store) ListDirectoryEntries(ctx context.Context, dir entry, err := store.FindEntry(ctx, path) lastFileName = fileName if err != nil { - glog.V(0).Infof("list %s : %v", path, err) + log.V(3).Infof("list %s : %v", path, err) if err == filer_pb.ErrNotFound { return true } |