diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-11-16 22:26:58 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-11-16 22:26:58 -0800 |
| commit | 6c9156b25f8b1c28fb0cc909310a20aeeec0e087 (patch) | |
| tree | 343e30d98e46a081aa57adfc334b807d0b3255dc /weed/command | |
| parent | 9add554feb53706d1d878cc9636d234e622b8a80 (diff) | |
| download | seaweedfs-origin/logrus.tar.xz seaweedfs-origin/logrus.zip | |
switch to logrusorigin/logrus
losing filename and line number. Critical for debugging.
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/benchmark.go | 8 | ||||
| -rw-r--r-- | weed/command/compact.go | 8 | ||||
| -rw-r--r-- | weed/command/export.go | 16 | ||||
| -rw-r--r-- | weed/command/filer.go | 18 | ||||
| -rw-r--r-- | weed/command/filer_replication.go | 26 | ||||
| -rw-r--r-- | weed/command/filer_sync.go | 10 | ||||
| -rw-r--r-- | weed/command/fix.go | 12 | ||||
| -rw-r--r-- | weed/command/master.go | 20 | ||||
| -rw-r--r-- | weed/command/mount_std.go | 14 | ||||
| -rw-r--r-- | weed/command/msg_broker.go | 10 | ||||
| -rw-r--r-- | weed/command/s3.go | 22 | ||||
| -rw-r--r-- | weed/command/server.go | 8 | ||||
| -rw-r--r-- | weed/command/volume.go | 44 | ||||
| -rw-r--r-- | weed/command/volume_test.go | 4 | ||||
| -rw-r--r-- | weed/command/webdav.go | 22 |
15 files changed, 121 insertions, 121 deletions
diff --git a/weed/command/benchmark.go b/weed/command/benchmark.go index 080312aa8..904ed6494 100644 --- a/weed/command/benchmark.go +++ b/weed/command/benchmark.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/util" @@ -119,7 +119,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() @@ -310,7 +310,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() @@ -329,7 +329,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 6117cf9f3..625a44b5b 100644 --- a/weed/command/compact.go +++ b/weed/command/compact.go @@ -1,7 +1,7 @@ package command import ( - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/util" @@ -44,15 +44,15 @@ func runCompact(cmd *Command, args []string) bool { v, err := storage.NewVolume(util.ResolvePath(*compactVolumePath), *compactVolumeCollection, vid, storage.NeedleMapInMemory, nil, nil, preallocate, 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); 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 78d75ef52..cf1e953e9 100644 --- a/weed/command/export.go +++ b/weed/command/export.go @@ -13,7 +13,7 @@ import ( "text/template" "time" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/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.Tracef("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.ToAcutalOffset() == 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.Tracef("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.Debugf("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.Debugf("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.Fatalf("Export Volume File [ERROR] %s\n", err) + log.Fatalf("Export Volume File [ERROR] %s\n", err) } return true } diff --git a/weed/command/filer.go b/weed/command/filer.go index 017427335..08d010e12 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/reflection" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/security" @@ -152,37 +152,37 @@ func (fo *FilerOptions) startFiler() { Filers: peers, }) 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 := *fo.bindIp + ":" + strconv.Itoa(*fo.publicPort) - glog.V(0).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) + log.Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) publicListener, e := util.NewListener(publicListeningAddress, 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) } }() } - glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port) + log.Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port) filerListener, e := util.NewListener( *fo.bindIp+":"+strconv.Itoa(*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.port + 10000 grpcL, err := util.NewListener(*fo.bindIp+":"+strconv.Itoa(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) @@ -191,7 +191,7 @@ func (fo *FilerOptions) startFiler() { httpS := &http.Server{Handler: defaultMux} 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_replication.go b/weed/command/filer_replication.go index 40f2b570b..1b154270e 100644 --- a/weed/command/filer_replication.go +++ b/weed/command/filer_replication.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/replication" "github.com/chrislusf/seaweedfs/weed/replication/sink" _ "github.com/chrislusf/seaweedfs/weed/replication/sink/azuresink" @@ -48,10 +48,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.Infof("Configure notification input to %s", input.GetName()) notificationInput = input break } @@ -69,7 +69,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) } } } @@ -78,10 +78,10 @@ func runFilerReplicate(cmd *Command, args []string) bool { 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.Infof("Configure sink to %s", sk.GetName()) dataSink = sk break } @@ -100,7 +100,7 @@ func runFilerReplicate(cmd *Command, args []string) bool { for { key, m, err := notificationInput.ReceiveMessage() if err != nil { - glog.Errorf("receive %s: %+v", key, err) + log.Errorf("receive %s: %+v", key, err) continue } if key == "" { @@ -108,16 +108,16 @@ func runFilerReplicate(cmd *Command, args []string) bool { continue } if m.OldEntry != nil && m.NewEntry == nil { - glog.V(1).Infof("delete: %s", key) + log.Debugf("delete: %s", key) } else if m.OldEntry == nil && m.NewEntry != nil { - glog.V(1).Infof(" add: %s", key) + log.Debugf(" add: %s", key) } else { - glog.V(1).Infof("modify: %s", key) + log.Debugf("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) } else { - glog.V(1).Infof("replicated %s", key) + log.Debugf("replicated %s", key) } } @@ -130,7 +130,7 @@ func validateOneEnabledInput(config *viper.Viper) { 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 af0a624b1..de369a72c 100644 --- a/weed/command/filer_sync.go +++ b/weed/command/filer_sync.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/replication" @@ -89,7 +89,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { err := doSubscribeFilerMetaChanges(grpcDialOption, *syncOptions.filerA, *syncOptions.aPath, *syncOptions.filerB, *syncOptions.bPath, *syncOptions.bReplication, *syncOptions.bCollection, *syncOptions.bTtlSec, *syncOptions.bDebug) 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) } } @@ -101,7 +101,7 @@ func runFilerSynchronize(cmd *Command, args []string) bool { err := doSubscribeFilerMetaChanges(grpcDialOption, *syncOptions.filerB, *syncOptions.bPath, *syncOptions.filerA, *syncOptions.aPath, *syncOptions.aReplication, *syncOptions.aCollection, *syncOptions.aTtlSec, *syncOptions.aDebug) 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) } } @@ -134,7 +134,7 @@ func doSubscribeFilerMetaChanges(grpcDialOption grpc.DialOption, sourceFiler, so 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.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{} @@ -264,7 +264,7 @@ func doSubscribeFilerMetaChanges(grpcDialOption grpc.DialOption, sourceFiler, so counter++ if lastWriteTime.Add(3 * time.Second).Before(time.Now()) { - glog.V(0).Infof("sync %s => %s progressed to %v %0.2f/sec", sourceFiler, targetFiler, time.Unix(0, resp.TsNs), float64(counter)/float64(3)) + log.Infof("sync %s => %s progressed to %v %0.2f/sec", sourceFiler, targetFiler, time.Unix(0, resp.TsNs), float64(counter)/float64(3)) counter = 0 lastWriteTime = time.Now() if err := writeSyncOffset(grpcDialOption, targetFiler, sourceFilerSignature, resp.TsNs); err != nil { diff --git a/weed/command/fix.go b/weed/command/fix.go index ae9a051b8..03599f909 100644 --- a/weed/command/fix.go +++ b/weed/command/fix.go @@ -5,7 +5,7 @@ import ( "path" "strconv" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/needle_map" @@ -47,12 +47,12 @@ func (scanner *VolumeFileScanner4Fix) ReadNeedleBody() bool { } func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64, needleHeader, needleBody []byte) error { - glog.V(2).Infof("key %d offset %d size %d disk_size %d compressed %v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed()) + log.Debugf("key %d offset %d size %d disk_size %d compressed %v", n.Id, offset, n.Size, n.DiskSize(scanner.version), n.IsCompressed()) if n.Size.IsValid() { pe := scanner.nm.Set(n.Id, types.ToOffset(offset), n.Size) - glog.V(2).Infof("saved %d with error %v", n.Size, pe) + log.Debugf("saved %d with error %v", n.Size, pe) } else { - glog.V(2).Infof("skipping deleted file ...") + log.Debugf("skipping deleted file ...") return scanner.nm.Delete(n.Id) } return nil @@ -79,12 +79,12 @@ func runFix(cmd *Command, args []string) bool { } if err := storage.ScanVolumeFile(util.ResolvePath(*fixVolumePath), *fixVolumeCollection, vid, storage.NeedleMapInMemory, scanner); err != nil { - glog.Fatalf("scan .dat File: %v", err) + log.Fatalf("scan .dat File: %v", err) os.Remove(indexFileName) } if err := nm.SaveToIdx(indexFileName); err != nil { - glog.Fatalf("save to .idx File: %v", err) + log.Fatalf("save to .idx File: %v", err) os.Remove(indexFileName) } diff --git a/weed/command/master.go b/weed/command/master.go index c03da7f5d..912211ff5 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -14,7 +14,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/util/grace" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/security" @@ -94,7 +94,7 @@ 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) } var masterWhiteList []string @@ -102,7 +102,7 @@ func runMaster(cmd *Command, args []string) bool { masterWhiteList = strings.Split(*m.whiteList, ",") } if *m.volumeSizeLimitMB > util.VolumeSizeLimitGB*1000 { - glog.Fatalf("volumeSizeLimitMB should be smaller than 30000") + log.Fatalf("volumeSizeLimitMB should be smaller than 30000") } startMaster(m, masterWhiteList) @@ -119,16 +119,16 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), peers) listeningAddress := *masterOption.ipBind + ":" + strconv.Itoa(*masterOption.port) - glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) + log.Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) masterListener, e := util.NewListener(listeningAddress, 0) if e != nil { - glog.Fatalf("Master startup error: %v", e) + log.Fatalf("Master startup error: %v", e) } // start raftServer raftServer, err := weed_server.NewRaftServer(security.LoadClientTLS(util.GetViper(), "grpc.master"), peers, myMasterAddress, util.ResolvePath(*masterOption.metaFolder), ms.Topo, *masterOption.raftResumeState) if raftServer == nil { - glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717: %s", *masterOption.metaFolder, err) + log.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717: %s", *masterOption.metaFolder, err) } ms.SetRaftServer(raftServer) r.HandleFunc("/cluster/status", raftServer.StatusHandler).Methods("GET") @@ -136,14 +136,14 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { grpcPort := *masterOption.port + 10000 grpcL, err := util.NewListener(*masterOption.ipBind+":"+strconv.Itoa(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) } // Create your protocol servers. grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.master")) master_pb.RegisterSeaweedServer(grpcS, ms) 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.Infof("Start Seaweed Master %s grpc server at %s:%d", util.Version(), *masterOption.ipBind, grpcPort) go grpcS.Serve(grpcL) go func() { @@ -165,7 +165,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { } func checkPeers(masterIp string, masterPort int, peers string) (masterAddress string, cleanedPeers []string) { - glog.V(0).Infof("current: %s:%d peers:%s", masterIp, masterPort, peers) + log.Infof("current: %s:%d peers:%s", masterIp, masterPort, peers) masterAddress = masterIp + ":" + strconv.Itoa(masterPort) if peers != "" { cleanedPeers = strings.Split(peers, ",") @@ -183,7 +183,7 @@ func checkPeers(masterIp string, masterPort int, peers string) (masterAddress st cleanedPeers = append(cleanedPeers, masterAddress) } if len(cleanedPeers)%2 == 0 { - glog.Fatalf("Only odd number of masters are supported!") + log.Fatalf("Only odd number of masters are supported!") } return } diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 83cb352ff..66e12757a 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -19,7 +19,7 @@ import ( "github.com/seaweedfs/fuse/fs" "github.com/chrislusf/seaweedfs/weed/filesys" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/security" @@ -54,7 +54,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { // parse filer grpc address filerGrpcAddress, err := pb.ParseFilerGrpcAddress(filer) if err != nil { - glog.V(0).Infof("ParseFilerGrpcAddress: %v", err) + log.Infof("ParseFilerGrpcAddress: %v", err) return true } @@ -70,7 +70,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { return nil }) if err != nil { - glog.Infof("failed to talk to filer %s: %v", filerGrpcAddress, err) + log.Infof("failed to talk to filer %s: %v", filerGrpcAddress, err) return true } @@ -130,7 +130,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { // Ensure target mount point availability if isValid := checkMountPointAvailable(dir); !isValid { - glog.Fatalf("Expected mount to still be active, target mount point: %s, please check!", dir) + log.Fatalf("Expected mount to still be active, target mount point: %s, please check!", dir) return true } @@ -194,7 +194,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { // mount c, err := fuse.Mount(dir, options...) if err != nil { - glog.V(0).Infof("mount: %v", err) + log.Infof("mount: %v", err) return true } defer fuse.Unmount(dir) @@ -204,13 +204,13 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { c.Close() }) - glog.V(0).Infof("mounted %s%s to %s", filer, mountRoot, dir) + log.Infof("mounted %s%s to %s", filer, mountRoot, dir) err = fs.Serve(c, seaweedFileSystem) // check if the mount process has an error to report <-c.Ready if err := c.MountError; err != nil { - glog.V(0).Infof("mount process: %v", err) + log.Infof("mount process: %v", err) return true } diff --git a/weed/command/msg_broker.go b/weed/command/msg_broker.go index b4b5855ff..036eb959f 100644 --- a/weed/command/msg_broker.go +++ b/weed/command/msg_broker.go @@ -10,7 +10,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/util/grace" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/messaging/broker" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" @@ -65,7 +65,7 @@ func (msgBrokerOpt *MessageBrokerOptions) startQueueServer() bool { filerGrpcAddress, err := pb.ParseFilerGrpcAddress(*msgBrokerOpt.filer) if err != nil { - glog.Fatal(err) + log.Fatal(err) return false } @@ -82,10 +82,10 @@ func (msgBrokerOpt *MessageBrokerOptions) startQueueServer() bool { return nil }) if err != nil { - glog.V(0).Infof("wait to connect to filer %s grpc address %s", *msgBrokerOpt.filer, filerGrpcAddress) + log.Infof("wait to connect to filer %s grpc address %s", *msgBrokerOpt.filer, filerGrpcAddress) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *msgBrokerOpt.filer, filerGrpcAddress) + log.Infof("connected to filer %s grpc address %s", *msgBrokerOpt.filer, filerGrpcAddress) break } } @@ -102,7 +102,7 @@ func (msgBrokerOpt *MessageBrokerOptions) startQueueServer() bool { // start grpc listener grpcL, err := util.NewListener(":"+strconv.Itoa(*msgBrokerOpt.port), 0) if err != nil { - glog.Fatalf("failed to listen on grpc port %d: %v", *msgBrokerOpt.port, err) + log.Fatalf("failed to listen on grpc port %d: %v", *msgBrokerOpt.port, err) } grpcS := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.msg_broker")) messaging_pb.RegisterSeaweedMessagingServer(grpcS, qs) diff --git a/weed/command/s3.go b/weed/command/s3.go index ed5bb0b80..59fea2cd5 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -12,7 +12,7 @@ import ( "github.com/gorilla/mux" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/s3api" stats_collect "github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/util" @@ -137,7 +137,7 @@ func (s3opt *S3Options) startS3Server() bool { filerGrpcAddress, err := pb.ParseFilerGrpcAddress(*s3opt.filer) if err != nil { - glog.Fatal(err) + log.Fatal(err) return false } @@ -157,14 +157,14 @@ func (s3opt *S3Options) startS3Server() bool { } filerBucketsPath = resp.DirBuckets metricsAddress, metricsIntervalSec = resp.MetricsAddress, int(resp.MetricsIntervalSec) - glog.V(0).Infof("S3 read filer buckets dir: %s", filerBucketsPath) + log.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, filerGrpcAddress) + log.Infof("wait to connect to filer %s grpc address %s", *s3opt.filer, filerGrpcAddress) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *s3opt.filer, filerGrpcAddress) + log.Infof("connected to filer %s grpc address %s", *s3opt.filer, filerGrpcAddress) break } } @@ -183,7 +183,7 @@ func (s3opt *S3Options) startS3Server() bool { GrpcDialOption: grpcDialOption, }) 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} @@ -191,18 +191,18 @@ func (s3opt *S3Options) startS3Server() bool { listenAddress := fmt.Sprintf(":%d", *s3opt.port) s3ApiListener, err := util.NewListener(listenAddress, time.Duration(10)*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 *s3opt.tlsPrivateKey != "" { - glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) + log.Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) if err = httpS.ServeTLS(s3ApiListener, *s3opt.tlsCertificate, *s3opt.tlsPrivateKey); 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 http port %d", util.Version(), *s3opt.port) + log.Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) 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 4a9c2411a..a66f71d20 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -10,7 +10,7 @@ import ( stats_collect "github.com/chrislusf/seaweedfs/weed/stats" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/util" ) @@ -124,7 +124,7 @@ func runServer(cmd *Command, args []string) bool { if *serverOptions.cpuprofile != "" { f, err := os.Create(*serverOptions.cpuprofile) if err != nil { - glog.Fatal(err) + log.Fatal(err) } pprof.StartCPUProfile(f) defer pprof.StopCPUProfile() @@ -175,14 +175,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/volume.go b/weed/command/volume.go index ce5992665..9fe779460 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc/reflection" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" "github.com/chrislusf/seaweedfs/weed/server" stats_collect "github.com/chrislusf/seaweedfs/weed/stats" @@ -125,7 +125,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) } } @@ -135,7 +135,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v if max, e := strconv.Atoi(maxString); e == nil { v.folderMaxLimits = append(v.folderMaxLimits, 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 { @@ -144,7 +144,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)) } // set minFreeSpacePercent @@ -153,7 +153,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v if value, e := strconv.ParseFloat(freeString, 32); e == nil { v.minFreeSpacePercents = append(v.minFreeSpacePercents, float32(value)) } else { - glog.Fatalf("The value specified in -minFreeSpacePercent not a valid value %s", freeString) + log.Fatalf("The value specified in -minFreeSpacePercent not a valid value %s", freeString) } } if len(v.minFreeSpacePercents) == 1 && len(v.folders) > 1 { @@ -162,7 +162,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v } } if len(v.folders) != len(v.minFreeSpacePercents) { - glog.Fatalf("%d directories by -dir, but only %d minFreeSpacePercent is set by -minFreeSpacePercent", len(v.folders), len(v.minFreeSpacePercents)) + log.Fatalf("%d directories by -dir, but only %d minFreeSpacePercent is set by -minFreeSpacePercent", len(v.folders), len(v.minFreeSpacePercents)) } // security related white list configuration @@ -172,7 +172,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.Infof("detected volume server ip address: %v", *v.ip) } if *v.publicPort == 0 { @@ -226,7 +226,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") } } @@ -239,7 +239,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v // Stop heartbeats if !volumeServer.StopHeartbeat() { - glog.V(0).Infof("stop send heartbeat and wait %d seconds until shutdown ...", *v.preStopSeconds) + log.Infof("stop send heartbeat and wait %d seconds until shutdown ...", *v.preStopSeconds) time.Sleep(time.Duration(*v.preStopSeconds) * time.Second) } @@ -257,18 +257,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.Infof("stop public http server ... ") if err := publicHttpDown.Stop(); err != nil { - glog.Warningf("stop the public http server failed, %v", err) + log.Warnf("stop the public http server failed, %v", err) } } - glog.V(0).Infof("graceful stop cluster http server ... ") + log.Infof("graceful stop cluster http server ... ") if err := clusterHttpServer.Stop(); err != nil { - glog.Warningf("stop the cluster http server failed, %v", err) + log.Warnf("stop the cluster http server failed, %v", err) } - glog.V(0).Infof("graceful stop gRPC ...") + log.Infof("graceful stop gRPC ...") grpcS.GracefulStop() volumeServer.Shutdown() @@ -286,14 +286,14 @@ func (v VolumeServerOptions) startGrpcService(vs volume_server_pb.VolumeServerSe grpcPort := *v.port + 10000 grpcL, err := util.NewListener(*v.bindIp+":"+strconv.Itoa(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 @@ -301,17 +301,17 @@ func (v VolumeServerOptions) startGrpcService(vs volume_server_pb.VolumeServerSe func (v VolumeServerOptions) startPublicHttpService(handler http.Handler) httpdown.Server { publicListeningAddress := *v.bindIp + ":" + strconv.Itoa(*v.publicPort) - glog.V(0).Infoln("Start Seaweed volume server", util.Version(), "public at", publicListeningAddress) + log.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) } }() @@ -328,10 +328,10 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd } listeningAddress := *v.bindIp + ":" + strconv.Itoa(*v.port) - glog.V(0).Infof("Start Seaweed volume server %s at %s", util.Version(), listeningAddress) + log.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{ @@ -342,7 +342,7 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd clusterHttpServer := httpDown.Serve(&http.Server{Handler: handler}, 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 7399f1248..bcb5b0f59 100644 --- a/weed/command/volume_test.go +++ b/weed/command/volume_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/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.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 dc84b1fd0..3fbfcfc7d 100644 --- a/weed/command/webdav.go +++ b/weed/command/webdav.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/security" @@ -54,7 +54,7 @@ func runWebDav(cmd *Command, args []string) bool { util.LoadConfiguration("security", false) - glog.V(0).Infof("Starting Seaweed WebDav Server %s at https port %d", util.Version(), *webDavStandaloneOptions.port) + log.Infof("Starting Seaweed WebDav Server %s at https port %d", util.Version(), *webDavStandaloneOptions.port) return webDavStandaloneOptions.startWebDav() @@ -76,7 +76,7 @@ func (wo *WebDavOption) startWebDav() bool { // parse filer grpc address filerGrpcAddress, err := pb.ParseFilerGrpcAddress(*wo.filer) if err != nil { - glog.Fatal(err) + log.Fatal(err) return false } @@ -94,10 +94,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, filerGrpcAddress) + log.Infof("wait to connect to filer %s grpc address %s", *wo.filer, filerGrpcAddress) time.Sleep(time.Second) } else { - glog.V(0).Infof("connected to filer %s grpc address %s", *wo.filer, filerGrpcAddress) + log.Infof("connected to filer %s grpc address %s", *wo.filer, filerGrpcAddress) break } } @@ -114,7 +114,7 @@ func (wo *WebDavOption) startWebDav() bool { CacheSizeMB: *wo.cacheSizeMB, }) 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} @@ -122,18 +122,18 @@ func (wo *WebDavOption) startWebDav() bool { listenAddress := fmt.Sprintf(":%d", *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 port %d", util.Version(), *wo.port) + log.Infof("Start Seaweed WebDav Server %s at https port %d", util.Version(), *wo.port) 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 port %d", util.Version(), *wo.port) + log.Infof("Start Seaweed WebDav Server %s at http port %d", util.Version(), *wo.port) 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) } } |
