diff options
Diffstat (limited to 'weed/command')
28 files changed, 260 insertions, 260 deletions
diff --git a/weed/command/benchmark.go b/weed/command/benchmark.go index 08db2ef3d..2076a6f26 100644 --- a/weed/command/benchmark.go +++ b/weed/command/benchmark.go @@ -17,7 +17,7 @@ import ( "google.golang.org/grpc" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/security" "github.com/seaweedfs/seaweedfs/weed/util" @@ -123,7 +123,7 @@ func runBenchmark(cmd *Command, args []string) bool { if *b.cpuprofile != "" { f, err := os.Create(*b.cpuprofile) if err != nil { - glog.Fatal(err) + log.Fatal(err) } pprof.StartCPUProfile(f) defer pprof.StopCPUProfile() @@ -316,7 +316,7 @@ func readFiles(fileIdLineChan chan string, s *stat) { func writeFileIds(fileName string, fileIdLineChan chan string, finishChan chan bool) { file, err := os.OpenFile(fileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { - glog.Fatalf("File to create file %s: %s\n", fileName, err) + log.Fatalf("File to create file %s: %s\n", fileName, err) } defer file.Close() @@ -335,7 +335,7 @@ func writeFileIds(fileName string, fileIdLineChan chan string, finishChan chan b func readFileIds(fileName string, fileIdLineChan chan string) { file, err := os.Open(fileName) // For read access. if err != nil { - glog.Fatalf("File to read file %s: %s\n", fileName, err) + log.Fatalf("File to read file %s: %s\n", fileName, err) } defer file.Close() diff --git a/weed/command/compact.go b/weed/command/compact.go index 6f5f2307a..c3ff0a77c 100644 --- a/weed/command/compact.go +++ b/weed/command/compact.go @@ -1,7 +1,7 @@ package command import ( - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/util" @@ -43,15 +43,15 @@ func runCompact(cmd *Command, args []string) bool { vid := needle.VolumeId(*compactVolumeId) v, err := storage.NewVolume(util.ResolvePath(*compactVolumePath), util.ResolvePath(*compactVolumePath), *compactVolumeCollection, vid, storage.NeedleMapInMemory, nil, nil, preallocate, 0, 0) if err != nil { - glog.Fatalf("Load Volume [ERROR] %s\n", err) + log.Fatalf("Load Volume [ERROR] %s\n", err) } if *compactMethod == 0 { if err = v.Compact(preallocate, 0); err != nil { - glog.Fatalf("Compact Volume [ERROR] %s\n", err) + log.Fatalf("Compact Volume [ERROR] %s\n", err) } } else { if err = v.Compact2(preallocate, 0, nil); err != nil { - glog.Fatalf("Compact Volume [ERROR] %s\n", err) + log.Fatalf("Compact Volume [ERROR] %s\n", err) } } diff --git a/weed/command/export.go b/weed/command/export.go index e09d57056..0d38a775d 100644 --- a/weed/command/export.go +++ b/weed/command/export.go @@ -13,7 +13,7 @@ import ( "text/template" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/needle_map" @@ -111,11 +111,11 @@ func (scanner *VolumeFileScanner4Export) VisitNeedle(n *needle.Needle, offset in vid := scanner.vid nv, ok := needleMap.Get(n.Id) - glog.V(3).Infof("key %d offset %d size %d disk_size %d compressed %v ok %v nv %+v", + log.V(0).Infof("key %d offset %d size %d disk_size %d compressed %v ok %v nv %+v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed(), ok, nv) if *showDeleted && n.Size > 0 || ok && nv.Size.IsValid() && nv.Offset.ToActualOffset() == offset { if newerThanUnix >= 0 && n.HasLastModifiedDate() && n.LastModified < uint64(newerThanUnix) { - glog.V(3).Infof("Skipping this file, as it's old enough: LastModified %d vs %d", + log.V(0).Infof("Skipping this file, as it's old enough: LastModified %d vs %d", n.LastModified, newerThanUnix) return nil } @@ -139,9 +139,9 @@ func (scanner *VolumeFileScanner4Export) VisitNeedle(n *needle.Needle, offset in printNeedle(vid, n, scanner.version, true, offset, n.DiskSize(scanner.version)) } } - glog.V(2).Infof("This seems deleted %d size %d", n.Id, n.Size) + log.V(1).Infof("This seems deleted %d size %d", n.Id, n.Size) } else { - glog.V(2).Infof("Skipping later-updated Id %d size %d", n.Id, n.Size) + log.V(1).Infof("Skipping later-updated Id %d size %d", n.Id, n.Size) } return nil } @@ -178,7 +178,7 @@ func runExport(cmd *Command, args []string) bool { outputFile = os.Stdout } else { if outputFile, err = os.Create(*output); err != nil { - glog.Fatalf("cannot open output tar %s: %s", *output, err) + log.Fatalf("cannot open output tar %s: %s", *output, err) } } defer outputFile.Close() @@ -201,7 +201,7 @@ func runExport(cmd *Command, args []string) bool { defer needleMap.Close() if err := needleMap.LoadFromIdx(path.Join(util.ResolvePath(*export.dir), fileName+".idx")); err != nil { - glog.Fatalf("cannot load needle map from %s.idx: %s", fileName, err) + log.Fatalf("cannot load needle map from %s.idx: %s", fileName, err) } volumeFileScanner := &VolumeFileScanner4Export{ @@ -215,7 +215,7 @@ func runExport(cmd *Command, args []string) bool { err = storage.ScanVolumeFile(util.ResolvePath(*export.dir), *export.collection, vid, storage.NeedleMapInMemory, volumeFileScanner) if err != nil && err != io.EOF { - glog.Errorf("Export Volume File [ERROR] %s\n", err) + log.Errorf("Export Volume File [ERROR] %s\n", err) } return true } diff --git a/weed/command/filer.go b/weed/command/filer.go index 05b1e88c7..c5e447dc3 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -14,7 +14,7 @@ import ( "time" "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" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/security" @@ -324,44 +324,44 @@ func (fo *FilerOptions) startFiler() { AllowedOrigins: strings.Split(*fo.allowedOrigins, ","), }) if nfs_err != nil { - glog.Fatalf("Filer startup error: %v", nfs_err) + log.Fatalf("Filer startup error: %v", nfs_err) } if *fo.publicPort != 0 { publicListeningAddress := util.JoinHostPort(*fo.bindIp, *fo.publicPort) - glog.V(0).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) + log.V(3).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) publicListener, localPublicListener, e := util.NewIpAndLocalListeners(*fo.bindIp, *fo.publicPort, 0) if e != nil { - glog.Fatalf("Filer server public listener error on port %d:%v", *fo.publicPort, e) + log.Fatalf("Filer server public listener error on port %d:%v", *fo.publicPort, e) } go func() { if e := http.Serve(publicListener, publicVolumeMux); e != nil { - glog.Fatalf("Volume server fail to serve public: %v", e) + log.Fatalf("Volume server fail to serve public: %v", e) } }() if localPublicListener != nil { go func() { if e := http.Serve(localPublicListener, publicVolumeMux); e != nil { - glog.Errorf("Volume server fail to serve public: %v", e) + log.Errorf("Volume server fail to serve public: %v", e) } }() } } - glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port) + log.V(3).Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port) filerListener, filerLocalListener, e := util.NewIpAndLocalListeners( *fo.bindIp, *fo.port, time.Duration(10)*time.Second, ) if e != nil { - glog.Fatalf("Filer listener error: %v", e) + log.Fatalf("Filer listener error: %v", e) } // starting grpc server grpcPort := *fo.portGrpc grpcL, grpcLocalL, err := util.NewIpAndLocalListeners(*fo.bindIp, grpcPort, 0) if err != nil { - glog.Fatalf("failed to listen on grpc port %d: %v", grpcPort, err) + log.Fatalf("failed to listen on grpc port %d: %v", grpcPort, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.filer")) filer_pb.RegisterSeaweedFilerServer(grpcS, fs) @@ -378,13 +378,13 @@ func (fo *FilerOptions) startFiler() { localSocket = fmt.Sprintf("/tmp/seaweedfs-filer-%d.sock", *fo.port) } if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) { - glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) + log.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) } go func() { // start on local unix socket filerSocketListener, err := net.Listen("unix", localSocket) if err != nil { - glog.Fatalf("Failed to listen on %s: %v", localSocket, err) + log.Fatalf("Failed to listen on %s: %v", localSocket, err) } httpS.Serve(filerSocketListener) }() @@ -402,14 +402,14 @@ func (fo *FilerOptions) startFiler() { RefreshDuration: security.CredRefreshingInterval, } if fo.certProvider, err = pemfile.NewProvider(pemfileOptions); err != nil { - glog.Fatalf("pemfile.NewProvider(%v) failed: %v", pemfileOptions, err) + log.Fatalf("pemfile.NewProvider(%v) failed: %v", pemfileOptions, err) } caCertPool := x509.NewCertPool() if caCertFile != "" { caCertFile, err := os.ReadFile(caCertFile) if err != nil { - glog.Fatalf("error reading CA certificate: %v", err) + log.Fatalf("error reading CA certificate: %v", err) } caCertPool.AppendCertsFromPEM(caCertFile) } @@ -428,23 +428,23 @@ func (fo *FilerOptions) startFiler() { if filerLocalListener != nil { go func() { if err := httpS.ServeTLS(filerLocalListener, "", ""); err != nil { - glog.Errorf("Filer Fail to serve: %v", e) + log.Errorf("Filer Fail to serve: %v", e) } }() } if err := httpS.ServeTLS(filerListener, "", ""); err != nil { - glog.Fatalf("Filer Fail to serve: %v", e) + log.Fatalf("Filer Fail to serve: %v", e) } } else { if filerLocalListener != nil { go func() { if err := httpS.Serve(filerLocalListener); err != nil { - glog.Errorf("Filer Fail to serve: %v", e) + log.Errorf("Filer Fail to serve: %v", e) } }() } if err := httpS.Serve(filerListener); err != nil { - glog.Fatalf("Filer Fail to serve: %v", e) + log.Fatalf("Filer Fail to serve: %v", e) } } } diff --git a/weed/command/filer_backup.go b/weed/command/filer_backup.go index 380540fd9..3a47fc0d8 100644 --- a/weed/command/filer_backup.go +++ b/weed/command/filer_backup.go @@ -3,7 +3,7 @@ package command import ( "errors" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/replication/source" @@ -78,7 +78,7 @@ func runFilerBackup(cmd *Command, args []string) bool { clientEpoch++ err := doFilerBackup(grpcDialOption, &filerBackupOptions, clientId, clientEpoch) if err != nil { - glog.Errorf("backup from %s: %v", *filerBackupOptions.filer, err) + log.Errorf("backup from %s: %v", *filerBackupOptions.filer, err) time.Sleep(1747 * time.Millisecond) } } @@ -118,14 +118,14 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti if timeAgo.Milliseconds() == 0 { lastOffsetTsNs, err := getOffset(grpcDialOption, sourceFiler, BackupKeyPrefix, int32(sinkId)) if err != nil { - glog.V(0).Infof("starting from %v", startFrom) + log.V(3).Infof("starting from %v", startFrom) } else { startFrom = time.Unix(0, lastOffsetTsNs) - glog.V(0).Infof("resuming from %v", startFrom) + log.V(3).Infof("resuming from %v", startFrom) } } else { startFrom = time.Now().Add(-timeAgo) - glog.V(0).Infof("start time is set to %v", startFrom) + log.V(3).Infof("start time is set to %v", startFrom) } // create filer sink @@ -146,7 +146,7 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti return nil } if errors.Is(err, http.ErrNotFound) { - glog.V(0).Infof("got 404 error, ignore it: %s", err.Error()) + log.V(3).Infof("got 404 error, ignore it: %s", err.Error()) return nil } return err @@ -156,7 +156,7 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti } processEventFnWithOffset := pb.AddOffsetFunc(processEventFn, 3*time.Second, func(counter int64, lastTsNs int64) error { - glog.V(0).Infof("backup %s progressed to %v %0.2f/sec", sourceFiler, time.Unix(0, lastTsNs), float64(counter)/float64(3)) + log.V(3).Infof("backup %s progressed to %v %0.2f/sec", sourceFiler, time.Unix(0, lastTsNs), float64(counter)/float64(3)) return setOffset(grpcDialOption, sourceFiler, BackupKeyPrefix, int32(sinkId), lastTsNs) }) @@ -167,7 +167,7 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti time.Sleep(time.Hour * 24) key := util.Join(targetPath, now.Add(-1*time.Hour*24*time.Duration(*filerBackupOptions.retentionDays)).Format("2006-01-02")) _ = dataSink.DeleteEntry(util.Join(targetPath, key), true, true, nil) - glog.V(0).Infof("incremental backup delete directory:%s", key) + log.V(3).Infof("incremental backup delete directory:%s", key) } }() } diff --git a/weed/command/filer_meta_backup.go b/weed/command/filer_meta_backup.go index e8c4680ba..09faea34a 100644 --- a/weed/command/filer_meta_backup.go +++ b/weed/command/filer_meta_backup.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "github.com/seaweedfs/seaweedfs/weed/filer" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/spf13/viper" "google.golang.org/grpc" "reflect" @@ -64,13 +64,13 @@ func runFilerMetaBackup(cmd *Command, args []string) bool { v.SetConfigFile(*metaBackup.backupFilerConfig) if err := v.ReadInConfig(); err != nil { // Handle errors reading the config file - glog.Fatalf("Failed to load %s file: %v\nPlease use this command to generate the a %s.toml file\n"+ + log.Fatalf("Failed to load %s file: %v\nPlease use this command to generate the a %s.toml file\n"+ " weed scaffold -config=%s -output=.\n\n\n", *metaBackup.backupFilerConfig, err, "backup_filer", "filer") } if err := metaBackup.initStore(v); err != nil { - glog.V(0).Infof("init backup filer store: %v", err) + log.V(3).Infof("init backup filer store: %v", err) return true } @@ -81,13 +81,13 @@ func runFilerMetaBackup(cmd *Command, args []string) bool { } if *metaBackup.restart || missingPreviousBackup { - glog.V(0).Infof("traversing metadata tree...") + log.V(3).Infof("traversing metadata tree...") startTime := time.Now() if err := metaBackup.traverseMetadata(); err != nil { - glog.Errorf("traverse meta data: %v", err) + log.Errorf("traverse meta data: %v", err) return true } - glog.V(0).Infof("metadata copied up to %v", startTime) + log.V(3).Infof("metadata copied up to %v", startTime) if err := metaBackup.setOffset(startTime); err != nil { startTime = time.Now() } @@ -96,7 +96,7 @@ func runFilerMetaBackup(cmd *Command, args []string) bool { for { err := metaBackup.streamMetadataBackup() if err != nil { - glog.Errorf("filer meta backup from %s: %v", *metaBackup.filerAddress, err) + log.Errorf("filer meta backup from %s: %v", *metaBackup.filerAddress, err) time.Sleep(1747 * time.Millisecond) } } @@ -111,9 +111,9 @@ func (metaBackup *FilerMetaBackupOptions) initStore(v *viper.Viper) error { if v.GetBool(store.GetName() + ".enabled") { store = reflect.New(reflect.ValueOf(store).Elem().Type()).Interface().(filer.FilerStore) if err := store.Initialize(v, store.GetName()+"."); err != nil { - glog.Fatalf("failed to initialize store for %s: %+v", store.GetName(), err) + log.Fatalf("failed to initialize store for %s: %+v", store.GetName(), err) } - glog.V(0).Infof("configured filer store to %s", store.GetName()) + log.V(3).Infof("configured filer store to %s", store.GetName()) hasDefaultStoreConfigured = true metaBackup.store = filer.NewFilerStoreWrapper(store) break @@ -155,7 +155,7 @@ func (metaBackup *FilerMetaBackupOptions) streamMetadataBackup() error { if err != nil { startTime = time.Now() } - glog.V(0).Infof("streaming from %v", startTime) + log.V(3).Infof("streaming from %v", startTime) store := metaBackup.store @@ -192,7 +192,7 @@ func (metaBackup *FilerMetaBackupOptions) streamMetadataBackup() error { processEventFnWithOffset := pb.AddOffsetFunc(eachEntryFunc, 3*time.Second, func(counter int64, lastTsNs int64) error { lastTime := time.Unix(0, lastTsNs) - glog.V(0).Infof("meta backup %s progressed to %v %0.2f/sec", *metaBackup.filerAddress, lastTime, float64(counter)/float64(3)) + log.V(3).Infof("meta backup %s progressed to %v %0.2f/sec", *metaBackup.filerAddress, lastTime, float64(counter)/float64(3)) return metaBackup.setOffset(lastTime) }) diff --git a/weed/command/filer_remote_gateway.go b/weed/command/filer_remote_gateway.go index 3e52e8d3f..2c907c518 100644 --- a/weed/command/filer_remote_gateway.go +++ b/weed/command/filer_remote_gateway.go @@ -3,7 +3,7 @@ package command import ( "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" @@ -115,7 +115,7 @@ func runFilerRemoteGateway(cmd *Command, args []string) bool { return remoteGatewayOptions.followBucketUpdatesAndUploadToRemote(filerSource) }, func(err error) bool { if err != nil { - glog.Errorf("synchronize %s: %v", remoteGatewayOptions.bucketsDir, err) + log.Errorf("synchronize %s: %v", remoteGatewayOptions.bucketsDir, err) } return true }) diff --git a/weed/command/filer_remote_gateway_buckets.go b/weed/command/filer_remote_gateway_buckets.go index f6fe9a99c..dc75116c5 100644 --- a/weed/command/filer_remote_gateway_buckets.go +++ b/weed/command/filer_remote_gateway_buckets.go @@ -3,7 +3,7 @@ package command import ( "fmt" "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" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" @@ -43,7 +43,7 @@ func (option *RemoteGatewayOptions) followBucketUpdatesAndUploadToRemote(filerSo return nil } now := time.Now().UnixNano() - glog.V(0).Infof("remote sync %s progressed to %v %0.2f/sec", *option.filerAddress, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) + log.V(3).Infof("remote sync %s progressed to %v %0.2f/sec", *option.filerAddress, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) lastLogTsNs = now return remote_storage.SetSyncOffset(option.grpcDialOption, pb.ServerAddress(*option.filerAddress), option.bucketsDir, offsetTsNs) }) @@ -78,12 +78,12 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour } if option.mappings.PrimaryBucketStorageName != "" && *option.createBucketAt == "" { *option.createBucketAt = option.mappings.PrimaryBucketStorageName - glog.V(0).Infof("%s is set as the primary remote storage", *option.createBucketAt) + log.V(3).Infof("%s is set as the primary remote storage", *option.createBucketAt) } if len(option.mappings.Mappings) == 1 && *option.createBucketAt == "" { for k := range option.mappings.Mappings { *option.createBucketAt = k - glog.V(0).Infof("%s is set as the only remote storage", *option.createBucketAt) + log.V(3).Infof("%s is set as the only remote storage", *option.createBucketAt) } } if *option.createBucketAt == "" { @@ -132,7 +132,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour bucketName = remoteLocation.Bucket } - glog.V(0).Infof("create bucket %s", bucketName) + log.V(3).Infof("create bucket %s", bucketName) if err := client.CreateBucket(bucketName); err != nil { return fmt.Errorf("create bucket %s in %s: %v", bucketName, remoteConf.Name, err) } @@ -150,7 +150,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour return fmt.Errorf("findRemoteStorageClient %s: %v", entry.Name, err) } - glog.V(0).Infof("delete remote bucket %s", remoteStorageMountLocation.Bucket) + log.V(3).Infof("delete remote bucket %s", remoteStorageMountLocation.Bucket) if err := client.DeleteBucket(remoteStorageMountLocation.Bucket); err != nil { return fmt.Errorf("delete remote bucket %s: %v", remoteStorageMountLocation.Bucket, err) } @@ -219,17 +219,17 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour if err != nil { return err } - glog.V(2).Infof("create: %+v", resp) + log.V(1).Infof("create: %+v", resp) if !shouldSendToRemote(message.NewEntry) { - glog.V(2).Infof("skipping creating: %+v", resp) + log.V(1).Infof("skipping creating: %+v", resp) return nil } dest := toRemoteStorageLocation(bucket, util.NewFullPath(message.NewParentPath, message.NewEntry.Name), remoteStorageMountLocation) if message.NewEntry.IsDirectory { - glog.V(0).Infof("mkdir %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("mkdir %s", remote_storage.FormatLocation(dest)) return client.WriteDirectory(dest, message.NewEntry) } - glog.V(0).Infof("create %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("create %s", remote_storage.FormatLocation(dest)) remoteEntry, writeErr := retriedWriteFile(client, filerSource, message.NewEntry, dest) if writeErr != nil { return writeErr @@ -248,13 +248,13 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour if err != nil { return err } - glog.V(2).Infof("delete: %+v", resp) + log.V(1).Infof("delete: %+v", resp) dest := toRemoteStorageLocation(bucket, util.NewFullPath(resp.Directory, message.OldEntry.Name), remoteStorageMountLocation) if message.OldEntry.IsDirectory { - glog.V(0).Infof("rmdir %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("rmdir %s", remote_storage.FormatLocation(dest)) return client.RemoveDirectory(dest) } - glog.V(0).Infof("delete %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("delete %s", remote_storage.FormatLocation(dest)) return client.DeleteFile(dest) } if message.OldEntry != nil && message.NewEntry != nil { @@ -278,7 +278,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour newBucket, newRemoteStorageMountLocation, newRemoteStorage, newOk := option.detectBucketInfo(message.NewParentPath) if oldOk && newOk { if !shouldSendToRemote(message.NewEntry) { - glog.V(2).Infof("skipping updating: %+v", resp) + log.V(1).Infof("skipping updating: %+v", resp) return nil } client, err := remote_storage.GetRemoteStorage(oldRemoteStorage) @@ -292,7 +292,7 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour return nil } if message.OldEntry.RemoteEntry != nil && filer.IsSameData(message.OldEntry, message.NewEntry) { - glog.V(2).Infof("update meta: %+v", resp) + log.V(1).Infof("update meta: %+v", resp) oldDest := toRemoteStorageLocation(oldBucket, util.NewFullPath(resp.Directory, message.OldEntry.Name), oldRemoteStorageMountLocation) return client.UpdateFileMetadata(oldDest, message.OldEntry, message.NewEntry) } else { @@ -316,14 +316,14 @@ func (option *RemoteGatewayOptions) makeBucketedEventProcessor(filerSource *sour if message.OldEntry.IsDirectory { return client.RemoveDirectory(oldDest) } - glog.V(0).Infof("delete %s", remote_storage.FormatLocation(oldDest)) + log.V(3).Infof("delete %s", remote_storage.FormatLocation(oldDest)) if err := client.DeleteFile(oldDest); err != nil { return err } } if newOk { if !shouldSendToRemote(message.NewEntry) { - glog.V(2).Infof("skipping updating: %+v", resp) + log.V(1).Infof("skipping updating: %+v", resp) return nil } client, err := remote_storage.GetRemoteStorage(newRemoteStorage) @@ -375,13 +375,13 @@ func (option *RemoteGatewayOptions) detectBucketInfo(actualDir string) (bucket u var isMounted bool remoteStorageMountLocation, isMounted = option.mappings.Mappings[string(bucket)] if !isMounted { - glog.Warningf("%s is not mounted", bucket) + log.Warningf("%s is not mounted", bucket) return "", nil, nil, false } var hasClient bool remoteConf, hasClient = option.remoteConfs[remoteStorageMountLocation.Name] if !hasClient { - glog.Warningf("%s mounted to un-configured %+v", bucket, remoteStorageMountLocation) + log.Warningf("%s mounted to un-configured %+v", bucket, remoteStorageMountLocation) return "", nil, nil, false } return bucket, remoteStorageMountLocation, remoteConf, true @@ -422,7 +422,7 @@ func (option *RemoteGatewayOptions) collectRemoteStorageConf() (err error) { }, "", false, math.MaxUint32) if option.mappings.PrimaryBucketStorageName == "" && len(option.remoteConfs) == 1 { - glog.V(0).Infof("%s is set to the default remote storage", lastConfName) + log.V(3).Infof("%s is set to the default remote storage", lastConfName) option.mappings.PrimaryBucketStorageName = lastConfName } diff --git a/weed/command/filer_remote_sync.go b/weed/command/filer_remote_sync.go index 77dd95134..3eb9f4aa1 100644 --- a/weed/command/filer_remote_sync.go +++ b/weed/command/filer_remote_sync.go @@ -2,7 +2,7 @@ package command import ( "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/replication/source" @@ -94,7 +94,7 @@ func runFilerRemoteSynchronize(cmd *Command, args []string) bool { return followUpdatesAndUploadToRemote(&remoteSyncOptions, filerSource, dir) }, func(err error) bool { if err != nil { - glog.Errorf("synchronize %s: %v", dir, err) + log.Errorf("synchronize %s: %v", dir, err) } return true }) diff --git a/weed/command/filer_remote_sync_dir.go b/weed/command/filer_remote_sync_dir.go index 186523e45..f1bd34d93 100644 --- a/weed/command/filer_remote_sync_dir.go +++ b/weed/command/filer_remote_sync_dir.go @@ -9,7 +9,7 @@ import ( "time" "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" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" @@ -57,7 +57,7 @@ func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *sour } // use processor.processedTsWatermark instead of the lastTsNs from the most recent job now := time.Now().UnixNano() - glog.V(0).Infof("remote sync %s progressed to %v %0.2f/sec", *option.filerAddress, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) + log.V(3).Infof("remote sync %s progressed to %v %0.2f/sec", *option.filerAddress, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) lastLogTsNs = now return remote_storage.SetSyncOffset(option.grpcDialOption, pb.ServerAddress(*option.filerAddress), mountedDir, offsetTsNs) }) @@ -103,10 +103,10 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem } if remoteLoc, found := mappings.Mappings[mountedDir]; found { if remoteStorageMountLocation.Bucket != remoteLoc.Bucket || remoteStorageMountLocation.Path != remoteLoc.Path { - glog.Fatalf("Unexpected mount changes %+v => %+v", remoteStorageMountLocation, remoteLoc) + log.Fatalf("Unexpected mount changes %+v => %+v", remoteStorageMountLocation, remoteLoc) } } else { - glog.V(0).Infof("unmounted %s exiting ...", mountedDir) + log.V(3).Infof("unmounted %s exiting ...", mountedDir) os.Exit(0) } } @@ -142,17 +142,17 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem if !filer.HasData(message.NewEntry) { return nil } - glog.V(2).Infof("create: %+v", resp) + log.V(1).Infof("create: %+v", resp) if !shouldSendToRemote(message.NewEntry) { - glog.V(2).Infof("skipping creating: %+v", resp) + log.V(1).Infof("skipping creating: %+v", resp) return nil } dest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(message.NewParentPath, message.NewEntry.Name), remoteStorageMountLocation) if message.NewEntry.IsDirectory { - glog.V(0).Infof("mkdir %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("mkdir %s", remote_storage.FormatLocation(dest)) return client.WriteDirectory(dest, message.NewEntry) } - glog.V(0).Infof("create %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("create %s", remote_storage.FormatLocation(dest)) remoteEntry, writeErr := retriedWriteFile(client, filerSource, message.NewEntry, dest) if writeErr != nil { return writeErr @@ -160,13 +160,13 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem return updateLocalEntry(option, message.NewParentPath, message.NewEntry, remoteEntry) } if filer_pb.IsDelete(resp) { - glog.V(2).Infof("delete: %+v", resp) + log.V(1).Infof("delete: %+v", resp) dest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(resp.Directory, message.OldEntry.Name), remoteStorageMountLocation) if message.OldEntry.IsDirectory { - glog.V(0).Infof("rmdir %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("rmdir %s", remote_storage.FormatLocation(dest)) return client.RemoveDirectory(dest) } - glog.V(0).Infof("delete %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("delete %s", remote_storage.FormatLocation(dest)) return client.DeleteFile(dest) } if message.OldEntry != nil && message.NewEntry != nil { @@ -176,7 +176,7 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem oldDest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(resp.Directory, message.OldEntry.Name), remoteStorageMountLocation) dest := toRemoteStorageLocation(util.FullPath(mountedDir), util.NewFullPath(message.NewParentPath, message.NewEntry.Name), remoteStorageMountLocation) if !shouldSendToRemote(message.NewEntry) { - glog.V(2).Infof("skipping updating: %+v", resp) + log.V(1).Infof("skipping updating: %+v", resp) return nil } if message.NewEntry.IsDirectory { @@ -184,12 +184,12 @@ func (option *RemoteSyncOptions) makeEventProcessor(remoteStorage *remote_pb.Rem } if resp.Directory == message.NewParentPath && message.OldEntry.Name == message.NewEntry.Name { if filer.IsSameData(message.OldEntry, message.NewEntry) { - glog.V(2).Infof("update meta: %+v", resp) + log.V(1).Infof("update meta: %+v", resp) return client.UpdateFileMetadata(dest, message.OldEntry, message.NewEntry) } } - glog.V(2).Infof("update: %+v", resp) - glog.V(0).Infof("delete %s", remote_storage.FormatLocation(oldDest)) + log.V(1).Infof("update: %+v", resp) + log.V(3).Infof("delete %s", remote_storage.FormatLocation(oldDest)) if err := client.DeleteFile(oldDest); err != nil { if isMultipartUploadFile(resp.Directory, message.OldEntry.Name) { return nil @@ -211,7 +211,7 @@ func retriedWriteFile(client remote_storage.RemoteStorageClient, filerSource *so var writeErr error err = util.Retry("writeFile", func() error { reader := filer.NewFileReader(filerSource, newEntry) - glog.V(0).Infof("create %s", remote_storage.FormatLocation(dest)) + log.V(3).Infof("create %s", remote_storage.FormatLocation(dest)) remoteEntry, writeErr = client.WriteFile(dest, newEntry, reader) if writeErr != nil { return writeErr @@ -219,7 +219,7 @@ func retriedWriteFile(client remote_storage.RemoteStorageClient, filerSource *so return nil }) if err != nil { - glog.Errorf("write to %s: %v", dest, err) + log.Errorf("write to %s: %v", dest, err) } return } @@ -232,7 +232,7 @@ func collectLastSyncOffset(filerClient filer_pb.FilerClient, grpcDialOption grpc if timeAgo == 0 { mountedDirEntry, err := filer_pb.GetEntry(filerClient, util.FullPath(mountedDir)) if err != nil { - glog.V(0).Infof("get mounted directory %s: %v", mountedDir, err) + log.V(3).Infof("get mounted directory %s: %v", mountedDir, err) return time.Now() } @@ -240,7 +240,7 @@ func collectLastSyncOffset(filerClient filer_pb.FilerClient, grpcDialOption grpc if mountedDirEntry != nil { if err == nil && mountedDirEntry.Attributes.Crtime < lastOffsetTsNs/1000000 { lastOffsetTs = time.Unix(0, lastOffsetTsNs) - glog.V(0).Infof("resume from %v", lastOffsetTs) + log.V(3).Infof("resume from %v", lastOffsetTs) } else { lastOffsetTs = time.Unix(mountedDirEntry.Attributes.Crtime, 0) } diff --git a/weed/command/filer_replication.go b/weed/command/filer_replication.go index f53fdfb48..2455af817 100644 --- a/weed/command/filer_replication.go +++ b/weed/command/filer_replication.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/replication" "github.com/seaweedfs/seaweedfs/weed/replication/sink" "github.com/seaweedfs/seaweedfs/weed/replication/sub" @@ -42,10 +42,10 @@ func runFilerReplicate(cmd *Command, args []string) bool { for _, input := range sub.NotificationInputs { if config.GetBool("notification." + input.GetName() + ".enabled") { if err := input.Initialize(config, "notification."+input.GetName()+"."); err != nil { - glog.Fatalf("Failed to initialize notification input for %s: %+v", + log.Fatalf("Failed to initialize notification input for %s: %+v", input.GetName(), err) } - glog.V(0).Infof("Configure notification input to %s", input.GetName()) + log.V(3).Infof("Configure notification input to %s", input.GetName()) notificationInput = input break } @@ -63,7 +63,7 @@ func runFilerReplicate(cmd *Command, args []string) bool { fromDir := config.GetString("source.filer.directory") toDir := config.GetString("sink.filer.directory") if strings.HasPrefix(toDir, fromDir) { - glog.Fatalf("recursive replication! source directory %s includes the sink directory %s", fromDir, toDir) + log.Fatalf("recursive replication! source directory %s includes the sink directory %s", fromDir, toDir) } } } @@ -83,7 +83,7 @@ func runFilerReplicate(cmd *Command, args []string) bool { for { key, m, onSuccessFn, onFailureFn, err := notificationInput.ReceiveMessage() if err != nil { - glog.Errorf("receive %s: %+v", key, err) + log.Errorf("receive %s: %+v", key, err) if onFailureFn != nil { onFailureFn() } @@ -97,19 +97,19 @@ func runFilerReplicate(cmd *Command, args []string) bool { continue } if m.OldEntry != nil && m.NewEntry == nil { - glog.V(1).Infof("delete: %s", key) + log.V(2).Infof("delete: %s", key) } else if m.OldEntry == nil && m.NewEntry != nil { - glog.V(1).Infof("add: %s", key) + log.V(2).Infof("add: %s", key) } else { - glog.V(1).Infof("modify: %s", key) + log.V(2).Infof("modify: %s", key) } if err = replicator.Replicate(context.Background(), key, m); err != nil { - glog.Errorf("replicate %s: %+v", key, err) + log.Errorf("replicate %s: %+v", key, err) if onFailureFn != nil { onFailureFn() } } else { - glog.V(1).Infof("replicated %s", key) + log.V(2).Infof("replicated %s", key) if onSuccessFn != nil { onSuccessFn() } @@ -123,10 +123,10 @@ func findSink(config *util.ViperProxy) sink.ReplicationSink { for _, sk := range sink.Sinks { if config.GetBool("sink." + sk.GetName() + ".enabled") { if err := sk.Initialize(config, "sink."+sk.GetName()+"."); err != nil { - glog.Fatalf("Failed to initialize sink for %s: %+v", + log.Fatalf("Failed to initialize sink for %s: %+v", sk.GetName(), err) } - glog.V(0).Infof("Configure sink to %s", sk.GetName()) + log.V(3).Infof("Configure sink to %s", sk.GetName()) dataSink = sk break } @@ -141,7 +141,7 @@ func validateOneEnabledInput(config *util.ViperProxy) { if enabledInput == "" { enabledInput = input.GetName() } else { - glog.Fatalf("Notification input is enabled for both %s and %s", enabledInput, input.GetName()) + log.Fatalf("Notification input is enabled for both %s and %s", enabledInput, input.GetName()) } } } diff --git a/weed/command/filer_sync.go b/weed/command/filer_sync.go index 9b489297c..a72423616 100644 --- a/weed/command/filer_sync.go +++ b/weed/command/filer_sync.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/replication" @@ -133,13 +133,13 @@ func runFilerSynchronize(cmd *Command, args []string) bool { // read a filer signature aFilerSignature, aFilerErr := replication.ReadFilerSignature(grpcDialOption, filerA) if aFilerErr != nil { - glog.Errorf("get filer 'a' signature %d error from %s to %s: %v", aFilerSignature, *syncOptions.filerA, *syncOptions.filerB, aFilerErr) + log.Errorf("get filer 'a' signature %d error from %s to %s: %v", aFilerSignature, *syncOptions.filerA, *syncOptions.filerB, aFilerErr) return true } // read b filer signature bFilerSignature, bFilerErr := replication.ReadFilerSignature(grpcDialOption, filerB) if bFilerErr != nil { - glog.Errorf("get filer 'b' signature %d error from %s to %s: %v", bFilerSignature, *syncOptions.filerA, *syncOptions.filerB, bFilerErr) + log.Errorf("get filer 'b' signature %d error from %s to %s: %v", bFilerSignature, *syncOptions.filerA, *syncOptions.filerB, bFilerErr) return true } @@ -148,7 +148,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { // set synchronization start timestamp to offset initOffsetError := initOffsetFromTsMs(grpcDialOption, filerB, aFilerSignature, *syncOptions.bFromTsMs, getSignaturePrefixByPath(*syncOptions.aPath)) if initOffsetError != nil { - glog.Errorf("init offset from timestamp %d error from %s to %s: %v", *syncOptions.bFromTsMs, *syncOptions.filerA, *syncOptions.filerB, initOffsetError) + log.Errorf("init offset from timestamp %d error from %s to %s: %v", *syncOptions.bFromTsMs, *syncOptions.filerA, *syncOptions.filerB, initOffsetError) os.Exit(2) } for { @@ -174,7 +174,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { aFilerSignature, bFilerSignature) if err != nil { - glog.Errorf("sync from %s to %s: %v", *syncOptions.filerA, *syncOptions.filerB, err) + log.Errorf("sync from %s to %s: %v", *syncOptions.filerA, *syncOptions.filerB, err) time.Sleep(1747 * time.Millisecond) } } @@ -185,7 +185,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { // set synchronization start timestamp to offset initOffsetError := initOffsetFromTsMs(grpcDialOption, filerA, bFilerSignature, *syncOptions.aFromTsMs, getSignaturePrefixByPath(*syncOptions.bPath)) if initOffsetError != nil { - glog.Errorf("init offset from timestamp %d error from %s to %s: %v", *syncOptions.aFromTsMs, *syncOptions.filerB, *syncOptions.filerA, initOffsetError) + log.Errorf("init offset from timestamp %d error from %s to %s: %v", *syncOptions.aFromTsMs, *syncOptions.filerB, *syncOptions.filerA, initOffsetError) os.Exit(2) } go func() { @@ -212,7 +212,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { bFilerSignature, aFilerSignature) if err != nil { - glog.Errorf("sync from %s to %s: %v", *syncOptions.filerB, *syncOptions.filerA, err) + log.Errorf("sync from %s to %s: %v", *syncOptions.filerB, *syncOptions.filerA, err) time.Sleep(2147 * time.Millisecond) } } @@ -236,7 +236,7 @@ func initOffsetFromTsMs(grpcDialOption grpc.DialOption, targetFiler pb.ServerAdd if setOffsetErr != nil { return setOffsetErr } - glog.Infof("setOffset from timestamp ms success! start offset: %d from %s to %s", fromTsNs, *syncOptions.filerA, *syncOptions.filerB) + log.Infof("setOffset from timestamp ms success! start offset: %d from %s to %s", fromTsNs, *syncOptions.filerA, *syncOptions.filerB) return nil } @@ -250,7 +250,7 @@ func doSubscribeFilerMetaChanges(clientId int32, clientEpoch int32, grpcDialOpti return err } - glog.V(0).Infof("start sync %s(%d) => %s(%d) from %v(%d)", sourceFiler, sourceFilerSignature, targetFiler, targetFilerSignature, time.Unix(0, sourceFilerOffsetTsNs), sourceFilerOffsetTsNs) + log.V(3).Infof("start sync %s(%d) => %s(%d) from %v(%d)", sourceFiler, sourceFilerSignature, targetFiler, targetFilerSignature, time.Unix(0, sourceFilerOffsetTsNs), sourceFilerOffsetTsNs) // create filer sink filerSource := &source.FilerSource{} @@ -273,7 +273,7 @@ func doSubscribeFilerMetaChanges(clientId int32, clientEpoch int32, grpcDialOpti } if concurrency < 0 || concurrency > 1024 { - glog.Warningf("invalid concurrency value, using default: %d", DefaultConcurrencyLimit) + log.Warningf("invalid concurrency value, using default: %d", DefaultConcurrencyLimit) concurrency = DefaultConcurrencyLimit } processor := NewMetadataProcessor(processEventFn, concurrency, sourceFilerOffsetTsNs) @@ -290,7 +290,7 @@ func doSubscribeFilerMetaChanges(clientId int32, clientEpoch int32, grpcDialOpti } // use processor.processedTsWatermark instead of the lastTsNs from the most recent job now := time.Now().UnixNano() - glog.V(0).Infof("sync %s to %s progressed to %v %0.2f/sec", sourceFiler, targetFiler, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) + log.V(3).Infof("sync %s to %s progressed to %v %0.2f/sec", sourceFiler, targetFiler, time.Unix(0, offsetTsNs), float64(counter)/(float64(now-lastLogTsNs)/1e9)) lastLogTsNs = now // collect synchronous offset statsCollect.FilerSyncOffsetGauge.WithLabelValues(sourceFiler.String(), targetFiler.String(), clientName, sourcePath).Set(float64(offsetTsNs)) @@ -397,7 +397,7 @@ func genProcessFunction(sourcePath string, targetPath string, excludePaths []str } if debug { - glog.V(0).Infof("received %v", resp) + log.V(3).Infof("received %v", resp) } if isMultipartUploadDir(resp.Directory + "/") { diff --git a/weed/command/filer_sync_jobs.go b/weed/command/filer_sync_jobs.go index d49031b98..a5e3c294f 100644 --- a/weed/command/filer_sync_jobs.go +++ b/weed/command/filer_sync_jobs.go @@ -1,7 +1,7 @@ package command import ( - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" @@ -46,7 +46,7 @@ func (t *MetadataProcessor) AddSyncJob(resp *filer_pb.SubscribeMetadataResponse) if err := util.Retry("metadata processor", func() error { return t.fn(resp) }); err != nil { - glog.Errorf("process %v: %v", resp, err) + log.Errorf("process %v: %v", resp, err) } t.activeJobsLock.Lock() diff --git a/weed/command/fix.go b/weed/command/fix.go index 4fb4ed88e..b55024a53 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/needle_map" @@ -53,7 +53,7 @@ func (scanner *VolumeFileScanner4Fix) ReadNeedleBody() bool { } func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64, needleHeader, needleBody []byte) error { - glog.V(2).Infof("key %v offset %d size %d disk_size %d compressed %v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed()) + log.V(1).Infof("key %v offset %d size %d disk_size %d compressed %v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed()) if n.Size.IsValid() { if pe := scanner.nm.Set(n.Id, types.ToOffset(offset), n.Size); pe != nil { return fmt.Errorf("saved %d with error %v", n.Size, pe) @@ -64,7 +64,7 @@ func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64 return fmt.Errorf("saved deleted %d with error %v", n.Size, pe) } } else { - glog.V(2).Infof("skipping deleted file ...") + log.V(1).Infof("skipping deleted file ...") return scanner.nm.Delete(n.Id) } } @@ -163,19 +163,19 @@ func doFixOneVolume(basepath string, baseFileName string, collection string, vol if err := storage.ScanVolumeFile(basepath, collection, vid, storage.NeedleMapInMemory, scanner); err != nil { err := fmt.Errorf("scan .dat File: %v", err) if *fixIgnoreError { - glog.Error(err) + log.Error(err) } else { - glog.Fatal(err) + log.Fatal(err) } } if err := SaveToIdx(scanner, indexFileName); err != nil { err := fmt.Errorf("save to .idx File: %v", err) if *fixIgnoreError { - glog.Error(err) + log.Error(err) } else { os.Remove(indexFileName) - glog.Fatal(err) + log.Fatal(err) } } } diff --git a/weed/command/iam.go b/weed/command/iam.go index f4a7df2ca..6b6ecd770 100644 --- a/weed/command/iam.go +++ b/weed/command/iam.go @@ -8,7 +8,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/iamapi" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" @@ -56,14 +56,14 @@ func (iamopt *IamOptions) startIamServer() bool { if err != nil { return fmt.Errorf("get filer %s configuration: %v", filerAddress, err) } - glog.V(0).Infof("IAM read filer configuration: %s", resp) + log.V(3).Infof("IAM read filer configuration: %s", resp) return nil }) if err != nil { - glog.V(0).Infof("wait to connect to filer %s grpc address %s", *iamopt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("wait to connect to filer %s grpc address %s", *iamopt.filer, filerAddress.ToGrpcAddress()) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *iamopt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("connected to filer %s grpc address %s", *iamopt.filer, filerAddress.ToGrpcAddress()) break } } @@ -76,9 +76,9 @@ func (iamopt *IamOptions) startIamServer() bool { Port: *iamopt.port, GrpcDialOption: grpcDialOption, }) - glog.V(0).Info("NewIamApiServer created") + log.V(3).Info("NewIamApiServer created") if iamApiServer_err != nil { - glog.Fatalf("IAM API Server startup error: %v", iamApiServer_err) + log.Fatalf("IAM API Server startup error: %v", iamApiServer_err) } httpS := &http.Server{Handler: router} @@ -86,19 +86,19 @@ func (iamopt *IamOptions) startIamServer() bool { listenAddress := fmt.Sprintf(":%d", *iamopt.port) iamApiListener, iamApiLocalListener, err := util.NewIpAndLocalListeners(*iamopt.ip, *iamopt.port, time.Duration(10)*time.Second) if err != nil { - glog.Fatalf("IAM API Server listener on %s error: %v", listenAddress, err) + log.Fatalf("IAM API Server listener on %s error: %v", listenAddress, err) } - glog.V(0).Infof("Start Seaweed IAM API Server %s at http port %d", util.Version(), *iamopt.port) + log.V(3).Infof("Start Seaweed IAM API Server %s at http port %d", util.Version(), *iamopt.port) if iamApiLocalListener != nil { go func() { if err = httpS.Serve(iamApiLocalListener); err != nil { - glog.Errorf("IAM API Server Fail to serve: %v", err) + log.Errorf("IAM API Server Fail to serve: %v", err) } }() } if err = httpS.Serve(iamApiListener); err != nil { - glog.Fatalf("IAM API Server Fail to serve: %v", err) + log.Fatalf("IAM API Server Fail to serve: %v", err) } return true diff --git a/weed/command/master.go b/weed/command/master.go index 4392c766f..49484fccb 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -22,7 +22,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util/grace" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/security" @@ -117,12 +117,12 @@ func runMaster(cmd *Command, args []string) bool { os.MkdirAll(*m.metaFolder, 0755) } if err := util.TestFolderWritable(util.ResolvePath(*m.metaFolder)); err != nil { - glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *m.metaFolder, err) + log.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *m.metaFolder, err) } masterWhiteList := util.StringSplit(*m.whiteList, ",") if *m.volumeSizeLimitMB > util.VolumeSizeLimitGB*1000 { - glog.Fatalf("volumeSizeLimitMB should be smaller than 30000") + log.Fatalf("volumeSizeLimitMB should be smaller than 30000") } switch { @@ -160,10 +160,10 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), masterPeers) listeningAddress := util.JoinHostPort(*masterOption.ipBind, *masterOption.port) - glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) + log.V(3).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOption.ipBind, *masterOption.port, 0) if e != nil { - glog.Fatalf("Master startup error: %v", e) + log.Fatalf("Master startup error: %v", e) } // start raftServer @@ -183,12 +183,12 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { var err error if *masterOption.raftHashicorp { if raftServer, err = weed_server.NewHashicorpRaftServer(raftServerOption); err != nil { - glog.Fatalf("NewHashicorpRaftServer: %s", err) + log.Fatalf("NewHashicorpRaftServer: %s", err) } } else { raftServer, err = weed_server.NewRaftServer(raftServerOption) if raftServer == nil { - glog.Fatalf("please verify %s is writable, see https://github.com/seaweedfs/seaweedfs/issues/717: %s", *masterOption.metaFolder, err) + log.Fatalf("please verify %s is writable, see https://github.com/seaweedfs/seaweedfs/issues/717: %s", *masterOption.metaFolder, err) } } ms.SetRaftServer(raftServer) @@ -201,7 +201,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { grpcPort := *masterOption.portGrpc grpcL, grpcLocalL, err := util.NewIpAndLocalListeners(*masterOption.ipBind, grpcPort, 0) if err != nil { - glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) + log.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.master")) master_pb.RegisterSeaweedServer(grpcS, ms) @@ -211,7 +211,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { protobuf.RegisterRaftServer(grpcS, raftServer) } reflection.Register(grpcS) - glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOption.ipBind, grpcPort) + log.V(3).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOption.ipBind, grpcPort) if grpcLocalL != nil { go grpcS.Serve(grpcLocalL) } @@ -279,7 +279,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { } func checkPeers(masterIp string, masterPort int, masterGrpcPort int, peers string) (masterAddress pb.ServerAddress, cleanedPeers []pb.ServerAddress) { - glog.V(0).Infof("current: %s:%d peers:%s", masterIp, masterPort, peers) + log.V(3).Infof("current: %s:%d peers:%s", masterIp, masterPort, peers) masterAddress = pb.NewServerAddress(masterIp, masterPort, masterGrpcPort) cleanedPeers = pb.ServerAddresses(peers).ToAddresses() @@ -295,7 +295,7 @@ func checkPeers(masterIp string, masterPort int, masterGrpcPort int, peers strin cleanedPeers = append(cleanedPeers, masterAddress) } if len(cleanedPeers)%2 == 0 { - glog.Fatalf("Only odd number of masters are supported: %+v", cleanedPeers) + log.Fatalf("Only odd number of masters are supported: %+v", cleanedPeers) } return } diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index 504ddb6c3..7f15090e8 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/gorilla/mux" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/security" @@ -99,13 +99,13 @@ func startMasterFollower(masterOptions MasterOptions) { return nil }) if err != nil { - glog.V(0).Infof("failed to talk to filer %v: %v", masters, err) - glog.V(0).Infof("wait for %d seconds ...", i+1) + log.V(3).Infof("failed to talk to filer %v: %v", masters, err) + log.V(3).Infof("wait for %d seconds ...", i+1) time.Sleep(time.Duration(i+1) * time.Second) } } if err != nil { - glog.Errorf("failed to talk to filer %v: %v", masters, err) + log.Errorf("failed to talk to filer %v: %v", masters, err) return } @@ -119,22 +119,22 @@ func startMasterFollower(masterOptions MasterOptions) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, option, masters) listeningAddress := util.JoinHostPort(*masterOptions.ipBind, *masterOptions.port) - glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) + log.V(3).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) if e != nil { - glog.Fatalf("Master startup error: %v", e) + log.Fatalf("Master startup error: %v", e) } // starting grpc server grpcPort := *masterOptions.portGrpc grpcL, grpcLocalL, err := util.NewIpAndLocalListeners(*masterOptions.ipBind, grpcPort, 0) if err != nil { - glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) + log.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.master")) master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) - glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOptions.ip, grpcPort) + log.V(3).Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOptions.ip, grpcPort) if grpcLocalL != nil { go grpcS.Serve(grpcLocalL) } diff --git a/weed/command/mount_linux.go b/weed/command/mount_linux.go index 1d1727519..0d5c645a6 100644 --- a/weed/command/mount_linux.go +++ b/weed/command/mount_linux.go @@ -3,7 +3,7 @@ package command import ( "bufio" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "io" "os" "strings" @@ -144,7 +144,7 @@ func checkMountPointAvailable(dir string) bool { if mounted, err := mounted(mountPoint); err != nil || mounted { if err != nil { - glog.Errorf("check %s: %v", mountPoint, err) + log.Errorf("check %s: %v", mountPoint, err) } return false } diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index f00daba8a..79cd8d632 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -16,7 +16,7 @@ import ( "time" "github.com/hanwen/go-fuse/v2/fuse" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/mount" "github.com/seaweedfs/seaweedfs/weed/mount/meta_cache" "github.com/seaweedfs/seaweedfs/weed/mount/unmount" @@ -81,13 +81,13 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { return nil }) if err != nil { - glog.V(0).Infof("failed to talk to filer %v: %v", filerAddresses, err) - glog.V(0).Infof("wait for %d seconds ...", i+1) + log.V(3).Infof("failed to talk to filer %v: %v", filerAddresses, err) + log.V(3).Infof("wait for %d seconds ...", i+1) time.Sleep(time.Duration(i+1) * time.Second) } } if err != nil { - glog.Errorf("failed to talk to filer %v: %v", filerAddresses, err) + log.Errorf("failed to talk to filer %v: %v", filerAddresses, err) return true } @@ -111,11 +111,11 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { *option.localSocket = fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", mountDirHash) } if err := os.Remove(*option.localSocket); err != nil && !os.IsNotExist(err) { - glog.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error()) + log.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error()) } montSocketListener, err := net.Listen("unix", *option.localSocket) if err != nil { - glog.Fatalf("Failed to listen on %s: %v", *option.localSocket, err) + log.Fatalf("Failed to listen on %s: %v", *option.localSocket, err) } // detect mount folder mode @@ -158,7 +158,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { // Ensure target mount point availability if isValid := checkMountPointAvailable(dir); !isValid { - glog.Fatalf("Target mount point is not available: %s, please check!", dir) + log.Fatalf("Target mount point is not available: %s, please check!", dir) return true } @@ -262,7 +262,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { server, err := fuse.NewServer(seaweedFileSystem, dir, fuseMountOptions) if err != nil { - glog.Fatalf("Mount fail: %v", err) + log.Fatalf("Mount fail: %v", err) } grace.OnInterrupt(func() { unmount.Unmount(dir) @@ -279,8 +279,8 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { return false } - glog.V(0).Infof("mounted %s%s to %v", *option.filer, mountRoot, dir) - glog.V(0).Infof("This is SeaweedFS version %s %s %s", util.Version(), runtime.GOOS, runtime.GOARCH) + log.V(3).Infof("mounted %s%s to %v", *option.filer, mountRoot, dir) + log.V(3).Infof("This is SeaweedFS version %s %s %s", util.Version(), runtime.GOOS, runtime.GOARCH) server.Serve() diff --git a/weed/command/mq_agent.go b/weed/command/mq_agent.go index ff4023e77..49f544766 100644 --- a/weed/command/mq_agent.go +++ b/weed/command/mq_agent.go @@ -5,7 +5,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/mq_agent_pb" "google.golang.org/grpc/reflection" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/security" "github.com/seaweedfs/seaweedfs/weed/util" @@ -62,9 +62,9 @@ func (mqAgentOpt *MessageQueueAgentOptions) startQueueAgent() bool { // start grpc listener grpcL, _, err := util.NewIpAndLocalListeners(*mqAgentOpt.ip, *mqAgentOpt.port, 0) if err != nil { - glog.Fatalf("failed to listen on grpc port %d: %v", *mqAgentOpt.port, err) + log.Fatalf("failed to listen on grpc port %d: %v", *mqAgentOpt.port, err) } - glog.Infof("Start Seaweed Message Queue Agent on %s:%d", *mqAgentOpt.ip, *mqAgentOpt.port) + log.Infof("Start Seaweed Message Queue Agent on %s:%d", *mqAgentOpt.ip, *mqAgentOpt.port) grpcS := pb.NewGrpcServer() mq_agent_pb.RegisterSeaweedMessagingAgentServer(grpcS, agentServer) reflection.Register(grpcS) diff --git a/weed/command/mq_broker.go b/weed/command/mq_broker.go index 5eb304204..e24da3705 100644 --- a/weed/command/mq_broker.go +++ b/weed/command/mq_broker.go @@ -5,7 +5,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util/grace" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/mq/broker" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" @@ -79,13 +79,13 @@ func (mqBrokerOpt *MessageQueueBrokerOptions) startQueueServer() bool { Port: *mqBrokerOpt.port, }, grpcDialOption) if err != nil { - glog.Fatalf("failed to create new message broker for queue server: %v", err) + log.Fatalf("failed to create new message broker for queue server: %v", err) } // start grpc listener grpcL, _, err := util.NewIpAndLocalListeners("", *mqBrokerOpt.port, 0) if err != nil { - glog.Fatalf("failed to listen on grpc port %d: %v", *mqBrokerOpt.port, err) + log.Fatalf("failed to listen on grpc port %d: %v", *mqBrokerOpt.port, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.msg_broker")) mq_pb.RegisterSeaweedMessagingServer(grpcS, qs) diff --git a/weed/command/s3.go b/weed/command/s3.go index 4f513a5fa..36886b45e 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/mux" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/s3api" stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util" @@ -212,14 +212,14 @@ func (s3opt *S3Options) startS3Server() bool { filerBucketsPath = resp.DirBuckets filerGroup = resp.FilerGroup metricsAddress, metricsIntervalSec = resp.MetricsAddress, int(resp.MetricsIntervalSec) - glog.V(0).Infof("S3 read filer buckets dir: %s", filerBucketsPath) + log.V(3).Infof("S3 read filer buckets dir: %s", filerBucketsPath) return nil }) if err != nil { - glog.V(0).Infof("wait to connect to filer %s grpc address %s", *s3opt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("wait to connect to filer %s grpc address %s", *s3opt.filer, filerAddress.ToGrpcAddress()) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *s3opt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("connected to filer %s grpc address %s", *s3opt.filer, filerAddress.ToGrpcAddress()) break } } @@ -246,7 +246,7 @@ func (s3opt *S3Options) startS3Server() bool { FilerGroup: filerGroup, }) if s3ApiServer_err != nil { - glog.Fatalf("S3 API Server startup error: %v", s3ApiServer_err) + log.Fatalf("S3 API Server startup error: %v", s3ApiServer_err) } httpS := &http.Server{Handler: router} @@ -264,13 +264,13 @@ func (s3opt *S3Options) startS3Server() bool { localSocket = fmt.Sprintf("/tmp/seaweedfs-s3-%d.sock", *s3opt.port) } if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) { - glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) + log.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) } go func() { // start on local unix socket s3SocketListener, err := net.Listen("unix", localSocket) if err != nil { - glog.Fatalf("Failed to listen on %s: %v", localSocket, err) + log.Fatalf("Failed to listen on %s: %v", localSocket, err) } httpS.Serve(s3SocketListener) }() @@ -280,7 +280,7 @@ func (s3opt *S3Options) startS3Server() bool { s3ApiListener, s3ApiLocalListener, err := util.NewIpAndLocalListeners( *s3opt.bindIp, *s3opt.port, time.Duration(*s3opt.idleTimeout)*time.Second) if err != nil { - glog.Fatalf("S3 API Server listener on %s error: %v", listenAddress, err) + log.Fatalf("S3 API Server listener on %s error: %v", listenAddress, err) } if len(*s3opt.auditLogConfig) > 0 { @@ -294,7 +294,7 @@ func (s3opt *S3Options) startS3Server() bool { grpcPort := *s3opt.portGrpc grpcL, grpcLocalL, err := util.NewIpAndLocalListeners(*s3opt.bindIp, grpcPort, 0) if err != nil { - glog.Fatalf("s3 failed to listen on grpc port %d: %v", grpcPort, err) + log.Fatalf("s3 failed to listen on grpc port %d: %v", grpcPort, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.s3")) s3_pb.RegisterSeaweedS3Server(grpcS, s3ApiServer) @@ -311,7 +311,7 @@ func (s3opt *S3Options) startS3Server() bool { RefreshDuration: security.CredRefreshingInterval, } if s3opt.certProvider, err = pemfile.NewProvider(pemfileOptions); err != nil { - glog.Fatalf("pemfile.NewProvider(%v) failed: %v", pemfileOptions, err) + log.Fatalf("pemfile.NewProvider(%v) failed: %v", pemfileOptions, err) } caCertPool := x509.NewCertPool() @@ -319,7 +319,7 @@ func (s3opt *S3Options) startS3Server() bool { // load CA certificate file and add it to list of client CAs caCertFile, err := ioutil.ReadFile(*s3opt.tlsCACertificate) if err != nil { - glog.Fatalf("error reading CA certificate: %v", err) + log.Fatalf("error reading CA certificate: %v", err) } caCertPool.AppendCertsFromPEM(caCertFile) } @@ -336,49 +336,49 @@ func (s3opt *S3Options) startS3Server() bool { } err = security.FixTlsConfig(util.GetViper(), httpS.TLSConfig) if err != nil { - glog.Fatalf("error with tls config: %v", err) + log.Fatalf("error with tls config: %v", err) } if *s3opt.portHttps == 0 { - glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) + log.V(3).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) if s3ApiLocalListener != nil { go func() { if err = httpS.ServeTLS(s3ApiLocalListener, "", ""); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } }() } if err = httpS.ServeTLS(s3ApiListener, "", ""); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } } else { - glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.portHttps) + log.V(3).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.portHttps) s3ApiListenerHttps, s3ApiLocalListenerHttps, _ := util.NewIpAndLocalListeners( *s3opt.bindIp, *s3opt.portHttps, time.Duration(*s3opt.idleTimeout)*time.Second) if s3ApiLocalListenerHttps != nil { go func() { if err = httpS.ServeTLS(s3ApiLocalListenerHttps, "", ""); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } }() } go func() { if err = httpS.ServeTLS(s3ApiListenerHttps, "", ""); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } }() } } if *s3opt.tlsPrivateKey == "" || *s3opt.portHttps > 0 { - glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) + log.V(3).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) if s3ApiLocalListener != nil { go func() { if err = httpS.Serve(s3ApiLocalListener); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } }() } if err = httpS.Serve(s3ApiListener); err != nil { - glog.Fatalf("S3 API Server Fail to serve: %v", err) + log.Fatalf("S3 API Server Fail to serve: %v", err) } } diff --git a/weed/command/server.go b/weed/command/server.go index dd3b0c8b4..aeacb2790 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -9,7 +9,7 @@ import ( stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/grace" @@ -281,14 +281,14 @@ func runServer(cmd *Command, args []string) bool { folders := strings.Split(*volumeDataFolders, ",") if *masterOptions.volumeSizeLimitMB > util.VolumeSizeLimitGB*1000 { - glog.Fatalf("masterVolumeSizeLimitMB should be less than 30000") + log.Fatalf("masterVolumeSizeLimitMB should be less than 30000") } if *masterOptions.metaFolder == "" { *masterOptions.metaFolder = folders[0] } if err := util.TestFolderWritable(util.ResolvePath(*masterOptions.metaFolder)); err != nil { - glog.Fatalf("Check Meta Folder (-mdir=\"%s\") Writable: %s", *masterOptions.metaFolder, err) + log.Fatalf("Check Meta Folder (-mdir=\"%s\") Writable: %s", *masterOptions.metaFolder, err) } filerOptions.defaultLevelDbDirectory = masterOptions.metaFolder diff --git a/weed/command/sftp.go b/weed/command/sftp.go index 117f01d6e..1f8567331 100644 --- a/weed/command/sftp.go +++ b/weed/command/sftp.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "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/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/security" @@ -110,14 +110,14 @@ func (sftpOpt *SftpOptions) startSftpServer() bool { } metricsAddress, metricsIntervalSec = resp.MetricsAddress, int(resp.MetricsIntervalSec) filerGroup = resp.FilerGroup - glog.V(0).Infof("SFTP read filer configuration, using filer at: %s", filerAddress) + log.V(3).Infof("SFTP read filer configuration, using filer at: %s", filerAddress) return nil }) if err != nil { - glog.V(0).Infof("Waiting to connect to filer %s grpc address %s...", *sftpOpt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("Waiting to connect to filer %s grpc address %s...", *sftpOpt.filer, filerAddress.ToGrpcAddress()) time.Sleep(time.Second) } else { - glog.V(0).Infof("Connected to filer %s grpc address %s", *sftpOpt.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("Connected to filer %s grpc address %s", *sftpOpt.filer, filerAddress.ToGrpcAddress()) break } } @@ -154,16 +154,16 @@ func (sftpOpt *SftpOptions) startSftpServer() bool { localSocket = fmt.Sprintf("/tmp/seaweedfs-sftp-%d.sock", *sftpOpt.port) } if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) { - glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) + log.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) } go func() { // start on local unix socket sftpSocketListener, err := net.Listen("unix", localSocket) if err != nil { - glog.Fatalf("Failed to listen on %s: %v", localSocket, err) + log.Fatalf("Failed to listen on %s: %v", localSocket, err) } if err := service.Serve(sftpSocketListener); err != nil { - glog.Fatalf("Failed to serve SFTP on socket %s: %v", localSocket, err) + log.Fatalf("Failed to serve SFTP on socket %s: %v", localSocket, err) } }() } @@ -172,21 +172,21 @@ func (sftpOpt *SftpOptions) startSftpServer() bool { listenAddress := fmt.Sprintf("%s:%d", *sftpOpt.bindIp, *sftpOpt.port) sftpListener, sftpLocalListener, err := util.NewIpAndLocalListeners(*sftpOpt.bindIp, *sftpOpt.port, time.Duration(10)*time.Second) if err != nil { - glog.Fatalf("SFTP server listener on %s error: %v", listenAddress, err) + log.Fatalf("SFTP server listener on %s error: %v", listenAddress, err) } - glog.V(0).Infof("Start Seaweed SFTP Server %s at %s", util.Version(), listenAddress) + log.V(3).Infof("Start Seaweed SFTP Server %s at %s", util.Version(), listenAddress) if sftpLocalListener != nil { go func() { if err := service.Serve(sftpLocalListener); err != nil { - glog.Fatalf("SFTP Server failed to serve on local listener: %v", err) + log.Fatalf("SFTP Server failed to serve on local listener: %v", err) } }() } if err := service.Serve(sftpListener); err != nil { - glog.Fatalf("SFTP Server failed to serve: %v", err) + log.Fatalf("SFTP Server failed to serve: %v", err) } return true diff --git a/weed/command/update.go b/weed/command/update.go index bf871d654..b611b14e5 100644 --- a/weed/command/update.go +++ b/weed/command/update.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/util" util_http "github.com/seaweedfs/seaweedfs/weed/util/http" "golang.org/x/net/context/ctxhttp" @@ -86,7 +86,7 @@ func runUpdate(cmd *Command, args []string) bool { if *updateOpt.dir != "" { if err := util.TestFolderWritable(util.ResolvePath(*updateOpt.dir)); err != nil { - glog.Fatalf("Check Folder(-dir) Writable %s : %s", *updateOpt.dir, err) + log.Fatalf("Check Folder(-dir) Writable %s : %s", *updateOpt.dir, err) return false } } else { @@ -101,16 +101,16 @@ func runUpdate(cmd *Command, args []string) bool { if runtime.GOOS == "windows" { if target == path { - glog.Fatalf("On windows, name of the new weed shouldn't be same to the original name.") + log.Fatalf("On windows, name of the new weed shouldn't be same to the original name.") return false } } - glog.V(0).Infof("new weed will be saved to %s", target) + log.V(3).Infof("new weed will be saved to %s", target) _, err := downloadRelease(context.Background(), target, *updateOpt.Version) if err != nil { - glog.Errorf("unable to download weed: %v", err) + log.Errorf("unable to download weed: %v", err) return false } return true @@ -125,14 +125,14 @@ func downloadRelease(ctx context.Context, target string, ver string) (version st if rel.Version == currentVersion { if ver == "0" { - glog.V(0).Infof("weed is up to date") + log.V(3).Infof("weed is up to date") } else { - glog.V(0).Infof("no need to download the same version of weed ") + log.V(3).Infof("no need to download the same version of weed ") } return currentVersion, nil } - glog.V(0).Infof("download version: %s", rel.Version) + log.V(3).Infof("download version: %s", rel.Version) largeDiskSuffix := "" if util.VolumeSizeLimitGB == 8000 { @@ -165,7 +165,7 @@ func downloadRelease(ctx context.Context, target string, ver string) (version st md5Ctx.Write(buf) binaryMd5 := md5Ctx.Sum(nil) if hex.EncodeToString(binaryMd5) != string(md5Val[0:32]) { - glog.Errorf("md5:'%s' '%s'", hex.EncodeToString(binaryMd5), string(md5Val[0:32])) + log.Errorf("md5:'%s' '%s'", hex.EncodeToString(binaryMd5), string(md5Val[0:32])) err = fmt.Errorf("binary md5sum doesn't match") return "", err } @@ -174,7 +174,7 @@ func downloadRelease(ctx context.Context, target string, ver string) (version st if err != nil { return "", err } else { - glog.V(0).Infof("successfully updated weed to version %v\n", rel.Version) + log.V(3).Infof("successfully updated weed to version %v\n", rel.Version) } return rel.Version, nil @@ -228,7 +228,7 @@ func GitHubLatestRelease(ctx context.Context, ver string, owner, repo string) (R } if ver == "0" { release = releaseList[0] - glog.V(0).Infof("latest version is %v\n", release.TagName) + log.V(3).Infof("latest version is %v\n", release.TagName) } else { for _, r := range releaseList { if r.TagName == ver { @@ -287,7 +287,7 @@ func getGithubDataFile(ctx context.Context, assets []Asset, suffix string) (file return "", nil, fmt.Errorf("unable to find file with suffix %v", suffix) } - glog.V(0).Infof("download %v\n", filename) + log.V(3).Infof("download %v\n", filename) data, err = getGithubData(ctx, url) if err != nil { return "", nil, err @@ -310,9 +310,9 @@ func extractToFile(buf []byte, filename, target string) error { hdr, terr := trd.Next() if terr != nil { if hdr != nil { - glog.Errorf("uncompress file(%s) failed:%s", hdr.Name, terr) + log.Errorf("uncompress file(%s) failed:%s", hdr.Name, terr) } else { - glog.Errorf("uncompress file is nil, failed:%s", terr) + log.Errorf("uncompress file is nil, failed:%s", terr) } return terr @@ -371,6 +371,6 @@ func extractToFile(buf []byte, filename, target string) error { return err } - glog.V(0).Infof("saved %d bytes in %v\n", n, target) + log.V(3).Infof("saved %d bytes in %v\n", n, target) return os.Chmod(target, mode) } diff --git a/weed/command/volume.go b/weed/command/volume.go index 2389d5561..d298447d1 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -24,7 +24,7 @@ import ( "google.golang.org/grpc/reflection" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" weed_server "github.com/seaweedfs/seaweedfs/weed/server" stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" @@ -156,7 +156,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v v.folders = strings.Split(volumeFolders, ",") for _, folder := range v.folders { if err := util.TestFolderWritable(util.ResolvePath(folder)); err != nil { - glog.Fatalf("Check Data Folder(-dir) Writable %s : %s", folder, err) + log.Fatalf("Check Data Folder(-dir) Writable %s : %s", folder, err) } } @@ -166,7 +166,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v if max, e := strconv.ParseInt(maxString, 10, 64); e == nil { v.folderMaxLimits = append(v.folderMaxLimits, int32(max)) } else { - glog.Fatalf("The max specified in -max not a valid number %s", maxString) + log.Fatalf("The max specified in -max not a valid number %s", maxString) } } if len(v.folderMaxLimits) == 1 && len(v.folders) > 1 { @@ -175,7 +175,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v } } if len(v.folders) != len(v.folderMaxLimits) { - glog.Fatalf("%d directories by -dir, but only %d max is set by -max", len(v.folders), len(v.folderMaxLimits)) + log.Fatalf("%d directories by -dir, but only %d max is set by -max", len(v.folders), len(v.folderMaxLimits)) } if len(minFreeSpaces) == 1 && len(v.folders) > 1 { @@ -184,7 +184,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v } } if len(v.folders) != len(minFreeSpaces) { - glog.Fatalf("%d directories by -dir, but only %d minFreeSpacePercent is set by -minFreeSpacePercent", len(v.folders), len(minFreeSpaces)) + log.Fatalf("%d directories by -dir, but only %d minFreeSpacePercent is set by -minFreeSpacePercent", len(v.folders), len(minFreeSpaces)) } // set disk types @@ -199,7 +199,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v } } if len(v.folders) != len(diskTypes) { - glog.Fatalf("%d directories by -dir, but only %d disk types is set by -disk", len(v.folders), len(diskTypes)) + log.Fatalf("%d directories by -dir, but only %d disk types is set by -disk", len(v.folders), len(diskTypes)) } // security related white list configuration @@ -207,7 +207,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v if *v.ip == "" { *v.ip = util.DetectedHostAddress() - glog.V(0).Infof("detected volume server ip address: %v", *v.ip) + log.V(3).Infof("detected volume server ip address: %v", *v.ip) } if *v.bindIp == "" { *v.bindIp = *v.ip @@ -272,7 +272,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v if v.isSeparatedPublicPort() { publicHttpDown = v.startPublicHttpService(publicVolumeMux) if nil == publicHttpDown { - glog.Fatalf("start public http service failed") + log.Fatalf("start public http service failed") } } @@ -289,7 +289,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v // Stop heartbeats if !volumeServer.StopHeartbeat() { volumeServer.SetStopping() - glog.V(0).Infof("stop send heartbeat and wait %d seconds until shutdown ...", *v.preStopSeconds) + log.V(3).Infof("stop send heartbeat and wait %d seconds until shutdown ...", *v.preStopSeconds) time.Sleep(time.Duration(*v.preStopSeconds) * time.Second) } @@ -307,18 +307,18 @@ func shutdown(publicHttpDown httpdown.Server, clusterHttpServer httpdown.Server, // firstly, stop the public http service to prevent from receiving new user request if nil != publicHttpDown { - glog.V(0).Infof("stop public http server ... ") + log.V(3).Infof("stop public http server ... ") if err := publicHttpDown.Stop(); err != nil { - glog.Warningf("stop the public http server failed, %v", err) + log.Warningf("stop the public http server failed, %v", err) } } - glog.V(0).Infof("graceful stop cluster http server ... ") + log.V(3).Infof("graceful stop cluster http server ... ") if err := clusterHttpServer.Stop(); err != nil { - glog.Warningf("stop the cluster http server failed, %v", err) + log.Warningf("stop the cluster http server failed, %v", err) } - glog.V(0).Infof("graceful stop gRPC ...") + log.V(3).Infof("graceful stop gRPC ...") grpcS.GracefulStop() volumeServer.Shutdown() @@ -336,14 +336,14 @@ func (v VolumeServerOptions) startGrpcService(vs volume_server_pb.VolumeServerSe grpcPort := *v.portGrpc grpcL, err := util.NewListener(util.JoinHostPort(*v.bindIp, grpcPort), 0) if err != nil { - glog.Fatalf("failed to listen on grpc port %d: %v", grpcPort, err) + log.Fatalf("failed to listen on grpc port %d: %v", grpcPort, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.volume")) volume_server_pb.RegisterVolumeServerServer(grpcS, vs) reflection.Register(grpcS) go func() { if err := grpcS.Serve(grpcL); err != nil { - glog.Fatalf("start gRPC service failed, %s", err) + log.Fatalf("start gRPC service failed, %s", err) } }() return grpcS @@ -351,17 +351,17 @@ func (v VolumeServerOptions) startGrpcService(vs volume_server_pb.VolumeServerSe func (v VolumeServerOptions) startPublicHttpService(handler http.Handler) httpdown.Server { publicListeningAddress := util.JoinHostPort(*v.bindIp, *v.publicPort) - glog.V(0).Infoln("Start Seaweed volume server", util.Version(), "public at", publicListeningAddress) + log.V(3).Infoln("Start Seaweed volume server", util.Version(), "public at", publicListeningAddress) publicListener, e := util.NewListener(publicListeningAddress, time.Duration(*v.idleConnectionTimeout)*time.Second) if e != nil { - glog.Fatalf("Volume server listener error:%v", e) + log.Fatalf("Volume server listener error:%v", e) } pubHttp := httpdown.HTTP{StopTimeout: 5 * time.Minute, KillTimeout: 5 * time.Minute} publicHttpDown := pubHttp.Serve(&http.Server{Handler: handler}, publicListener) go func() { if err := publicHttpDown.Wait(); err != nil { - glog.Errorf("public http down wait failed, %v", err) + log.Errorf("public http down wait failed, %v", err) } }() @@ -378,10 +378,10 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd } listeningAddress := util.JoinHostPort(*v.bindIp, *v.port) - glog.V(0).Infof("Start Seaweed volume server %s at %s", util.Version(), listeningAddress) + log.V(3).Infof("Start Seaweed volume server %s at %s", util.Version(), listeningAddress) listener, e := util.NewListener(listeningAddress, time.Duration(*v.idleConnectionTimeout)*time.Second) if e != nil { - glog.Fatalf("Volume server listener error:%v", e) + log.Fatalf("Volume server listener error:%v", e) } httpDown := httpdown.HTTP{ @@ -399,7 +399,7 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd clusterHttpServer := httpDown.Serve(httpS, listener) go func() { if e := clusterHttpServer.Wait(); e != nil { - glog.Fatalf("Volume server fail to serve: %v", e) + log.Fatalf("Volume server fail to serve: %v", e) } }() return clusterHttpServer diff --git a/weed/command/volume_test.go b/weed/command/volume_test.go index 801041a88..7693620a1 100644 --- a/weed/command/volume_test.go +++ b/weed/command/volume_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" ) func TestXYZ(t *testing.T) { - glog.V(0).Infoln("Last-Modified", time.Unix(int64(1373273596), 0).UTC().Format(http.TimeFormat)) + log.V(3).Infoln("Last-Modified", time.Unix(int64(1373273596), 0).UTC().Format(http.TimeFormat)) } diff --git a/weed/command/webdav.go b/weed/command/webdav.go index 02798b9b6..13cc40cf4 100644 --- a/weed/command/webdav.go +++ b/weed/command/webdav.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/security" @@ -65,7 +65,7 @@ func runWebDav(cmd *Command, args []string) bool { util.LoadSecurityConfiguration() listenAddress := fmt.Sprintf("%s:%d", *webDavStandaloneOptions.ipBind, *webDavStandaloneOptions.port) - glog.V(0).Infof("Starting Seaweed WebDav Server %s at %s", util.Version(), listenAddress) + log.V(3).Infof("Starting Seaweed WebDav Server %s at %s", util.Version(), listenAddress) return webDavStandaloneOptions.startWebDav() @@ -101,10 +101,10 @@ func (wo *WebDavOption) startWebDav() bool { return nil }) if err != nil { - glog.V(0).Infof("wait to connect to filer %s grpc address %s", *wo.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("wait to connect to filer %s grpc address %s", *wo.filer, filerAddress.ToGrpcAddress()) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *wo.filer, filerAddress.ToGrpcAddress()) + log.V(3).Infof("connected to filer %s grpc address %s", *wo.filer, filerAddress.ToGrpcAddress()) break } } @@ -124,7 +124,7 @@ func (wo *WebDavOption) startWebDav() bool { MaxMB: *wo.maxMB, }) if webdavServer_err != nil { - glog.Fatalf("WebDav Server startup error: %v", webdavServer_err) + log.Fatalf("WebDav Server startup error: %v", webdavServer_err) } httpS := &http.Server{Handler: ws.Handler} @@ -132,18 +132,18 @@ func (wo *WebDavOption) startWebDav() bool { listenAddress := fmt.Sprintf("%s:%d", *wo.ipBind, *wo.port) webDavListener, err := util.NewListener(listenAddress, time.Duration(10)*time.Second) if err != nil { - glog.Fatalf("WebDav Server listener on %s error: %v", listenAddress, err) + log.Fatalf("WebDav Server listener on %s error: %v", listenAddress, err) } if *wo.tlsPrivateKey != "" { - glog.V(0).Infof("Start Seaweed WebDav Server %s at https %s", util.Version(), listenAddress) + log.V(3).Infof("Start Seaweed WebDav Server %s at https %s", util.Version(), listenAddress) if err = httpS.ServeTLS(webDavListener, *wo.tlsCertificate, *wo.tlsPrivateKey); err != nil { - glog.Fatalf("WebDav Server Fail to serve: %v", err) + log.Fatalf("WebDav Server Fail to serve: %v", err) } } else { - glog.V(0).Infof("Start Seaweed WebDav Server %s at http %s", util.Version(), listenAddress) + log.V(3).Infof("Start Seaweed WebDav Server %s at http %s", util.Version(), listenAddress) if err = httpS.Serve(webDavListener); err != nil { - glog.Fatalf("WebDav Server Fail to serve: %v", err) + log.Fatalf("WebDav Server Fail to serve: %v", err) } } |