aboutsummaryrefslogtreecommitdiff
path: root/weed/command
diff options
context:
space:
mode:
Diffstat (limited to 'weed/command')
-rw-r--r--weed/command/benchmark.go3
-rw-r--r--weed/command/filer.go5
-rw-r--r--weed/command/iam.go3
-rw-r--r--weed/command/master.go5
-rw-r--r--weed/command/master_follower.go5
-rw-r--r--weed/command/mount_std.go3
-rw-r--r--weed/command/s3.go9
-rw-r--r--weed/command/sftp.go3
-rw-r--r--weed/command/update.go3
-rw-r--r--weed/command/version.go5
-rw-r--r--weed/command/volume.go5
-rw-r--r--weed/command/webdav.go7
12 files changed, 33 insertions, 23 deletions
diff --git a/weed/command/benchmark.go b/weed/command/benchmark.go
index 715ae3d67..e0cb31437 100644
--- a/weed/command/benchmark.go
+++ b/weed/command/benchmark.go
@@ -5,6 +5,7 @@ import (
"context"
"fmt"
"github.com/seaweedfs/seaweedfs/weed/pb"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"io"
"math"
"math/rand"
@@ -115,7 +116,7 @@ func runBenchmark(cmd *Command, args []string) bool {
util.LoadSecurityConfiguration()
b.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")
- fmt.Printf("This is SeaweedFS version %s %s %s\n", util.Version(), runtime.GOOS, runtime.GOARCH)
+ fmt.Printf("This is SeaweedFS version %s %s %s\n", version.Version(), runtime.GOOS, runtime.GOARCH)
if *b.maxCpu < 1 {
*b.maxCpu = runtime.NumCPU()
}
diff --git a/weed/command/filer.go b/weed/command/filer.go
index 05b1e88c7..aa4f878ad 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -5,6 +5,7 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net"
"net/http"
"os"
@@ -329,7 +330,7 @@ func (fo *FilerOptions) startFiler() {
if *fo.publicPort != 0 {
publicListeningAddress := util.JoinHostPort(*fo.bindIp, *fo.publicPort)
- glog.V(0).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress)
+ glog.V(0).Infoln("Start Seaweed filer server", version.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)
@@ -348,7 +349,7 @@ func (fo *FilerOptions) startFiler() {
}
}
- glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", util.Version(), *fo.ip, *fo.port)
+ glog.V(0).Infof("Start Seaweed Filer %s at %s:%d", version.Version(), *fo.ip, *fo.port)
filerListener, filerLocalListener, e := util.NewIpAndLocalListeners(
*fo.bindIp, *fo.port,
time.Duration(10)*time.Second,
diff --git a/weed/command/iam.go b/weed/command/iam.go
index f4a7df2ca..b0b0fc52a 100644
--- a/weed/command/iam.go
+++ b/weed/command/iam.go
@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net/http"
"time"
@@ -89,7 +90,7 @@ func (iamopt *IamOptions) startIamServer() bool {
glog.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)
+ glog.V(0).Infof("Start Seaweed IAM API Server %s at http port %d", version.Version(), *iamopt.port)
if iamApiLocalListener != nil {
go func() {
if err = httpS.Serve(iamApiLocalListener); err != nil {
diff --git a/weed/command/master.go b/weed/command/master.go
index 4392c766f..c7b979e05 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net/http"
"os"
"path"
@@ -160,7 +161,7 @@ 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)
+ glog.V(0).Infof("Start Seaweed Master %s at %s", version.Version(), listeningAddress)
masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOption.ipBind, *masterOption.port, 0)
if e != nil {
glog.Fatalf("Master startup error: %v", e)
@@ -211,7 +212,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)
+ glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", version.Version(), *masterOption.ipBind, grpcPort)
if grpcLocalL != nil {
go grpcS.Serve(grpcLocalL)
}
diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go
index 504ddb6c3..17beaa7ec 100644
--- a/weed/command/master_follower.go
+++ b/weed/command/master_follower.go
@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net/http"
"time"
@@ -119,7 +120,7 @@ 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)
+ glog.V(0).Infof("Start Seaweed Master %s at %s", version.Version(), listeningAddress)
masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0)
if e != nil {
glog.Fatalf("Master startup error: %v", e)
@@ -134,7 +135,7 @@ func startMasterFollower(masterOptions MasterOptions) {
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)
+ glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", version.Version(), *masterOptions.ip, grpcPort)
if grpcLocalL != nil {
go grpcS.Serve(grpcLocalL)
}
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go
index 18eb6bcce..84c84b767 100644
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -6,6 +6,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net"
"net/http"
"os"
@@ -290,7 +291,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
}
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)
+ glog.V(0).Infof("This is SeaweedFS version %s %s %s", version.Version(), runtime.GOOS, runtime.GOARCH)
server.Serve()
diff --git a/weed/command/s3.go b/weed/command/s3.go
index 4f513a5fa..aa8798eb1 100644
--- a/weed/command/s3.go
+++ b/weed/command/s3.go
@@ -5,6 +5,7 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"io/ioutil"
"net"
"net/http"
@@ -339,7 +340,7 @@ func (s3opt *S3Options) startS3Server() bool {
glog.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)
+ glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", version.Version(), *s3opt.port)
if s3ApiLocalListener != nil {
go func() {
if err = httpS.ServeTLS(s3ApiLocalListener, "", ""); err != nil {
@@ -351,9 +352,9 @@ func (s3opt *S3Options) startS3Server() bool {
glog.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)
+ glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", version.Version(), *s3opt.portHttps)
s3ApiListenerHttps, s3ApiLocalListenerHttps, _ := util.NewIpAndLocalListeners(
- *s3opt.bindIp, *s3opt.portHttps, time.Duration(*s3opt.idleTimeout)*time.Second)
+ *s3opt.bindIp, *s3opt.portHttps, time.Duration(*s3opt.idleTimeout)*time.Second)
if s3ApiLocalListenerHttps != nil {
go func() {
if err = httpS.ServeTLS(s3ApiLocalListenerHttps, "", ""); err != nil {
@@ -369,7 +370,7 @@ func (s3opt *S3Options) startS3Server() bool {
}
}
if *s3opt.tlsPrivateKey == "" || *s3opt.portHttps > 0 {
- glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port)
+ glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", version.Version(), *s3opt.port)
if s3ApiLocalListener != nil {
go func() {
if err = httpS.Serve(s3ApiLocalListener); err != nil {
diff --git a/weed/command/sftp.go b/weed/command/sftp.go
index 117f01d6e..ed93e44fe 100644
--- a/weed/command/sftp.go
+++ b/weed/command/sftp.go
@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net"
"os"
"runtime"
@@ -175,7 +176,7 @@ func (sftpOpt *SftpOptions) startSftpServer() bool {
glog.Fatalf("SFTP server listener on %s error: %v", listenAddress, err)
}
- glog.V(0).Infof("Start Seaweed SFTP Server %s at %s", util.Version(), listenAddress)
+ glog.V(0).Infof("Start Seaweed SFTP Server %s at %s", version.Version(), listenAddress)
if sftpLocalListener != nil {
go func() {
diff --git a/weed/command/update.go b/weed/command/update.go
index bf871d654..b07789264 100644
--- a/weed/command/update.go
+++ b/weed/command/update.go
@@ -10,6 +10,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"io"
"net/http"
"os"
@@ -117,7 +118,7 @@ func runUpdate(cmd *Command, args []string) bool {
}
func downloadRelease(ctx context.Context, target string, ver string) (version string, err error) {
- currentVersion := util.VERSION_NUMBER
+ currentVersion := version.VERSION_NUMBER
rel, err := GitHubLatestRelease(ctx, ver, "seaweedfs", "seaweedfs")
if err != nil {
return "", err
diff --git a/weed/command/version.go b/weed/command/version.go
index 8e9574691..bbbbbaff0 100644
--- a/weed/command/version.go
+++ b/weed/command/version.go
@@ -2,9 +2,8 @@ package command
import (
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"runtime"
-
- "github.com/seaweedfs/seaweedfs/weed/util"
)
var cmdVersion = &Command{
@@ -19,6 +18,6 @@ func runVersion(cmd *Command, args []string) bool {
cmd.Usage()
}
- fmt.Printf("version %s %s %s\n", util.Version(), runtime.GOOS, runtime.GOARCH)
+ fmt.Printf("version %s %s %s\n", version.Version(), runtime.GOOS, runtime.GOARCH)
return true
}
diff --git a/weed/command/volume.go b/weed/command/volume.go
index 2389d5561..c8917819b 100644
--- a/weed/command/volume.go
+++ b/weed/command/volume.go
@@ -2,6 +2,7 @@ package command
import (
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net/http"
httppprof "net/http/pprof"
"os"
@@ -351,7 +352,7 @@ 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)
+ glog.V(0).Infoln("Start Seaweed volume server", version.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)
@@ -378,7 +379,7 @@ 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)
+ glog.V(0).Infof("Start Seaweed volume server %s at %s", version.Version(), listeningAddress)
listener, e := util.NewListener(listeningAddress, time.Duration(*v.idleConnectionTimeout)*time.Second)
if e != nil {
glog.Fatalf("Volume server listener error:%v", e)
diff --git a/weed/command/webdav.go b/weed/command/webdav.go
index 02798b9b6..5ad0ca225 100644
--- a/weed/command/webdav.go
+++ b/weed/command/webdav.go
@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
"net/http"
"os"
"os/user"
@@ -65,7 +66,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)
+ glog.V(0).Infof("Starting Seaweed WebDav Server %s at %s", version.Version(), listenAddress)
return webDavStandaloneOptions.startWebDav()
@@ -136,12 +137,12 @@ func (wo *WebDavOption) startWebDav() bool {
}
if *wo.tlsPrivateKey != "" {
- glog.V(0).Infof("Start Seaweed WebDav Server %s at https %s", util.Version(), listenAddress)
+ glog.V(0).Infof("Start Seaweed WebDav Server %s at https %s", version.Version(), listenAddress)
if err = httpS.ServeTLS(webDavListener, *wo.tlsCertificate, *wo.tlsPrivateKey); err != nil {
glog.Fatalf("WebDav Server Fail to serve: %v", err)
}
} else {
- glog.V(0).Infof("Start Seaweed WebDav Server %s at http %s", util.Version(), listenAddress)
+ glog.V(0).Infof("Start Seaweed WebDav Server %s at http %s", version.Version(), listenAddress)
if err = httpS.Serve(webDavListener); err != nil {
glog.Fatalf("WebDav Server Fail to serve: %v", err)
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 19:25:55 +0000