cobra cli

cmd/peer.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"log"
+	"strconv"
+
+	"github.com/lbryio/reflector.go/db"
+	"github.com/lbryio/reflector.go/peer"
+	"github.com/lbryio/reflector.go/store"
+
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	var peerCmd = &cobra.Command{
+		Use:   "peer",
+		Short: "Run peer server",
+		Run:   peerCmd,
+	}
+	RootCmd.AddCommand(peerCmd)
+}
+
+func peerCmd(cmd *cobra.Command, args []string) {
+	db := new(db.SQL)
+	err := db.Connect(GlobalConfig.DBConn)
+	checkErr(err)
+
+	s3 := store.NewS3BlobStore(GlobalConfig.AwsID, GlobalConfig.AwsSecret, GlobalConfig.BucketRegion, GlobalConfig.BucketName)
+	combo := store.NewDBBackedS3Store(s3, db)
+	log.Fatal(peer.NewServer(combo).ListenAndServe("localhost:" + strconv.Itoa(peer.DefaultPort)))
+}

cmd/reflector.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"log"
+	"strconv"
+
+	"github.com/lbryio/reflector.go/db"
+	"github.com/lbryio/reflector.go/reflector"
+	"github.com/lbryio/reflector.go/store"
+
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	var reflectorCmd = &cobra.Command{
+		Use:   "reflector",
+		Short: "Run reflector server",
+		Run:   reflectorCmd,
+	}
+	RootCmd.AddCommand(reflectorCmd)
+}
+
+func reflectorCmd(cmd *cobra.Command, args []string) {
+	db := new(db.SQL)
+	err := db.Connect(GlobalConfig.DBConn)
+	checkErr(err)
+
+	s3 := store.NewS3BlobStore(GlobalConfig.AwsID, GlobalConfig.AwsSecret, GlobalConfig.BucketRegion, GlobalConfig.BucketName)
+	combo := store.NewDBBackedS3Store(s3, db)
+	log.Fatal(reflector.NewServer(combo).ListenAndServe("localhost:" + strconv.Itoa(reflector.DefaultPort)))
+}

cmd/root.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+type Config struct {
+	AwsID        string `json:"aws_id"`
+	AwsSecret    string `json:"aws_secret"`
+	BucketRegion string `json:"bucket_region"`
+	BucketName   string `json:"bucket_name"`
+	DBConn       string `json:"db_conn"`
+}
+
+var GlobalConfig Config
+
+// RootCmd represents the base command when called without any subcommands
+var RootCmd = &cobra.Command{
+	Use:   "reflector",
+	Short: "Reflector accepts blobs, stores them securely, and hosts them on the network",
+	// Uncomment the following line if your bare application
+	// has an action associated with it:
+	//	Run: func(cmd *cobra.Command, args []string) { },
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := RootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func checkErr(err error) {
+	if err != nil {
+		panic(err)
+	}
+}

main.go

@@ -2,17 +2,11 @@ package main
 
 import (
 	"encoding/json"
-	"flag"
 	"io/ioutil"
 	"math/rand"
-	"os"
-	"strconv"
 	"time"
 
-	"github.com/lbryio/reflector.go/db"
+	"github.com/lbryio/reflector.go/cmd"
-	"github.com/lbryio/reflector.go/peer"
-	"github.com/lbryio/reflector.go/reflector"
-	"github.com/lbryio/reflector.go/store"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -27,36 +21,9 @@ func main() {
 	rand.Seed(time.Now().UnixNano())
 	log.SetLevel(log.DebugLevel)
 
-	confFile := flag.String("conf", "config.json", "Config file")
+	cmd.GlobalConfig = loadConfig("config.json")
-	flag.Parse()
 
-	conf := loadConfig(*confFile)
+	cmd.Execute()
-
-	db := new(db.SQL)
-	err := db.Connect(conf.DBConn)
-	checkErr(err)
-
-	s3 := store.NewS3BlobStore(conf.AwsID, conf.AwsSecret, conf.BucketRegion, conf.BucketName)
-
-	combo := store.NewDBBackedS3Store(s3, db)
-
-	serverType := ""
-	if len(os.Args) > 1 {
-		serverType = os.Args[1]
-	}
-
-	switch serverType {
-	case "reflector":
-		reflectorAddress := "localhost:" + strconv.Itoa(reflector.DefaultPort)
-		server := reflector.NewServer(combo)
-		log.Fatal(server.ListenAndServe(reflectorAddress))
-	case "peer":
-		peerAddress := "localhost:" + strconv.Itoa(peer.DefaultPort)
-		server := peer.NewServer(combo)
-		log.Fatal(server.ListenAndServe(peerAddress))
-	default:
-		log.Fatal("invalid server type")
-	}
 
 	//
 	//var err error
@@ -80,19 +47,11 @@ func main() {
 	//checkErr(err)
 }
 
-type config struct {
+func loadConfig(path string) cmd.Config {
-	AwsID        string `json:"aws_id"`
-	AwsSecret    string `json:"aws_secret"`
-	BucketRegion string `json:"bucket_region"`
-	BucketName   string `json:"bucket_name"`
-	DBConn       string `json:"db_conn"`
-}
-
-func loadConfig(path string) config {
 	raw, err := ioutil.ReadFile(path)
 	checkErr(err)
 
-	var c config
+	var c cmd.Config
 	err = json.Unmarshal(raw, &c)
 	checkErr(err)