Merge branch 'master' into message-value

pingcap · Aug 1, 2021 · 22d835f · 22d835f
2 parents 140102f + 37d3e4b
commit 22d835f
Show file tree

Hide file tree

Showing 10 changed files with 628 additions and 412 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -16,6 +16,8 @@ package cmd
 import (
 	"os"
 
+	"github.com/pingcap/ticdc/pkg/cmd/server"
+	"github.com/pingcap/ticdc/pkg/cmd/version"
 	"github.com/spf13/cobra"
 )
 
@@ -29,6 +31,10 @@ var rootCmd = &cobra.Command{
 func Execute() {
 	// Outputs cmd.Print to stdout.
 	rootCmd.SetOut(os.Stdout)
+
+	rootCmd.AddCommand(server.NewCmdServer())
+	rootCmd.AddCommand(version.NewCmdVersion())
+
 	if err := rootCmd.Execute(); err != nil {
 		rootCmd.Println(err)
 		os.Exit(1)

diff --git a/cmd/server.go b/cmd/server.go
diff --git a/cmd/test.go b/cmd/test.go
diff --git a/cmd/version.go b/cmd/version.go
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -16,6 +16,7 @@ package cmd
 import (
 	"os"
 
+	"github.com/pingcap/ticdc/pkg/cmd/server"
 	"github.com/pingcap/ticdc/pkg/cmd/version"
 	"github.com/spf13/cobra"
 )
@@ -36,6 +37,7 @@ func Run() {
 	// Outputs cmd.Print to stdout.
 	cmd.SetOut(os.Stdout)
 
+	cmd.AddCommand(server.NewCmdServer())
 	cmd.AddCommand(version.NewCmdVersion())
 
 	if err := cmd.Execute(); err != nil {