Refactor: cfs-server -v add version 2.1.0

Signed-off-by: awzhgw <guowl18702995996@gmail.com>

client/fuse.go

@@ -69,14 +69,17 @@ const (
 	ControlCommandSetRate      = "/rate/set"
 	ControlCommandGetRate      = "/rate/get"
 	ControlCommandFreeOSMemory = "/debug/freeosmemory"
+	Role="Client"
 )
 
+
 var (
 	CommitID   string
 	BranchName string
 	BuildTime  string
 )
 
+
 var (
 	configFile       = flag.String("c", "", "FUSE client config file")
 	configVersion    = flag.Bool("v", false, "show version")
@@ -94,7 +97,7 @@ func main() {
 	flag.Parse()
 
 	if *configVersion {
-		fmt.Print(dumpVersion())
+		fmt.Print(proto.DumpVersion(Role,BranchName,CommitID,BuildTime))
 		os.Exit(0)
 	}
 

cmd/cmd.go

@@ -18,6 +18,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/chubaofs/chubaofs/console"
+	"github.com/chubaofs/chubaofs/proto"
 	syslog "log"
 	"net/http"
 	_ "net/http/pprof"
@@ -45,11 +46,6 @@ import (
 	"github.com/chubaofs/chubaofs/util/ump"
 )
 
-var (
-	CommitID   string
-	BranchName string
-	BuildTime  string
-)
 
 const (
 	ConfigKeyRole       = "role"
@@ -81,6 +77,12 @@ const (
 	LoggerOutput = "output.log"
 )
 
+var (
+	CommitID   string
+	BranchName string
+	BuildTime  string
+)
+
 var (
 	configFile       = flag.String("c", "", "config file path")
 	configVersion    = flag.Bool("v", false, "show version")
@@ -122,8 +124,7 @@ func modifyOpenFiles() (err error) {
 func main() {
 	flag.Parse()
 
-	Version := fmt.Sprintf("ChubaoFS Server\nBranch: %s\nCommit: %s\nBuild: %s %s %s %s\n", BranchName, CommitID, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildTime)
-
+	Version := proto.DumpVersion("Server",BranchName,CommitID,BuildTime)
 	if *configVersion {
 		fmt.Printf("%v", Version)
 		os.Exit(0)

proto/version.go

@@ -0,0 +1,15 @@
+package proto
+
+import (
+	"fmt"
+	"runtime"
+)
+
+const (
+	BaseVersion="2.1.0"
+)
+
+
+func DumpVersion(role,branchName,commitID,buildTime string) string {
+	return fmt.Sprintf("ChubaoFS %s\nBranch: %s\nVersion: %s\nCommit: %s\nBuild: %s %s %s %s\n", role,branchName, BaseVersion,commitID,runtime.Version(), runtime.GOOS, runtime.GOARCH, buildTime)
+}