Merge pull request #201 from jzelinskie/main-split

cmd: pull closure out into its own func and add config.go

cmd/chihaya/config.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"errors"
+	"io/ioutil"
+	"os"
+
+	"gopkg.in/yaml.v2"
+
+	httpfrontend "github.com/chihaya/chihaya/frontend/http"
+	udpfrontend "github.com/chihaya/chihaya/frontend/udp"
+	"github.com/chihaya/chihaya/middleware"
+	"github.com/chihaya/chihaya/storage/memory"
+)
+
+// ConfigFile represents a namespaced YAML configation file.
+type ConfigFile struct {
+	MainConfigBlock struct {
+		middleware.Config
+		PrometheusAddr string              `yaml:"prometheus_addr"`
+		HTTPConfig     httpfrontend.Config `yaml:"http"`
+		UDPConfig      udpfrontend.Config  `yaml:"udp"`
+		Storage        memory.Config       `yaml:"storage"`
+	} `yaml:"chihaya"`
+}
+
+// ParseConfigFile returns a new ConfigFile given the path to a YAML
+// configuration file.
+//
+// It supports relative and absolute paths and environment variables.
+func ParseConfigFile(path string) (*ConfigFile, error) {
+	if path == "" {
+		return nil, errors.New("no config path specified")
+	}
+
+	f, err := os.Open(os.ExpandEnv(path))
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	contents, err := ioutil.ReadAll(f)
+	if err != nil {
+		return nil, err
+	}
+
+	var cfgFile ConfigFile
+	err = yaml.Unmarshal(contents, &cfgFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return &cfgFile, nil
+}

cmd/chihaya/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -12,7 +11,6 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
 
 	httpfrontend "github.com/chihaya/chihaya/frontend/http"
 	udpfrontend "github.com/chihaya/chihaya/frontend/udp"
@@ -20,55 +18,8 @@ import (
 	"github.com/chihaya/chihaya/storage/memory"
 )
 
-type ConfigFile struct {
+func rootCmdRun(cmd *cobra.Command, args []string) error {
-	MainConfigBlock struct {
+	cpuProfilePath, _ := cmd.Flags().GetString("cpuprofile")
-		middleware.Config
-		PrometheusAddr string              `yaml:"prometheus_addr"`
-		HTTPConfig     httpfrontend.Config `yaml:"http"`
-		UDPConfig      udpfrontend.Config  `yaml:"udp"`
-		Storage        memory.Config       `yaml:"storage"`
-	} `yaml:"chihaya"`
-}
-
-// ParseConfigFile returns a new ConfigFile given the path to a YAML
-// configuration file.
-//
-// It supports relative and absolute paths and environment variables.
-func ParseConfigFile(path string) (*ConfigFile, error) {
-	if path == "" {
-		return nil, errors.New("no config path specified")
-	}
-
-	f, err := os.Open(os.ExpandEnv(path))
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	contents, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	var cfgFile ConfigFile
-	err = yaml.Unmarshal(contents, &cfgFile)
-	if err != nil {
-		return nil, err
-	}
-
-	return &cfgFile, nil
-}
-
-func main() {
-	var configFilePath string
-	var cpuProfilePath string
-
-	var rootCmd = &cobra.Command{
-		Use:   "chihaya",
-		Short: "BitTorrent Tracker",
-		Long:  "A customizible, multi-protocol BitTorrent Tracker",
-		Run: func(cmd *cobra.Command, args []string) {
-			if err := func() error {
 	if cpuProfilePath != "" {
 		log.Println("enabled CPU profiling to " + cpuProfilePath)
 		f, err := os.Create(cpuProfilePath)
@@ -79,6 +30,7 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 
+	configFilePath, _ := cmd.Flags().GetString("config")
 	configFile, err := ParseConfigFile(configFilePath)
 	if err != nil {
 		return errors.New("failed to read config: " + err.Error())
@@ -176,14 +128,21 @@ func main() {
 	}
 
 	return bufErr
-			}(); err != nil {
+}
+
+func main() {
+	var rootCmd = &cobra.Command{
+		Use:   "chihaya",
+		Short: "BitTorrent Tracker",
+		Long:  "A customizible, multi-protocol BitTorrent Tracker",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := rootCmdRun(cmd, args); err != nil {
 				log.Fatal(err)
 			}
 		},
 	}
-
+	rootCmd.Flags().String("config", "/etc/chihaya.yaml", "location of configuration file")
-	rootCmd.Flags().StringVar(&configFilePath, "config", "/etc/chihaya.yaml", "location of configuration file")
+	rootCmd.Flags().String("cpuprofile", "", "location to save a CPU profile")
-	rootCmd.Flags().StringVarP(&cpuProfilePath, "cpuprofile", "", "", "location to save a CPU profile")
 
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatal(err)