Merge 3960345 into 4a14e38

cmd/config.go

@@ -22,25 +22,31 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/pilosa/pilosa/ctl"
+	"github.com/pilosa/pilosa/server"
 )
 
 var Conf *ctl.ConfigCommand
 
 func NewConfigCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command {
 	Conf = ctl.NewConfigCommand(os.Stdin, os.Stdout, os.Stderr)
+	Server := server.NewCommand(stdin, stdout, stderr)
 	confCmd := &cobra.Command{
 		Use:   "config",
-		Short: "Print the default configuration.",
-		Long: `config prints the default configuration to stdout
-`,
+		Short: "Print the current configuration.",
+		Long:  `config prints the current configuration to stdout`,
+
 		RunE: func(cmd *cobra.Command, args []string) error {
+			Conf.Config = Server.Config
 			if err := Conf.Run(context.Background()); err != nil {
 				return err
 			}
 			return nil
 		},
 	}
 
+	// Attach flags to the command.
+	ctl.BuildServerFlags(confCmd, Server)
+
 	return confCmd
 }
 

cmd/generate_config.go

@@ -0,0 +1,49 @@
+// Copyright 2017 Pilosa Corp.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"context"
+	"io"
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"github.com/pilosa/pilosa/ctl"
+)
+
+var GenerateConf *ctl.GenerateConfigCommand
+
+func NewGenerateConfigCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command {
+	GenerateConf = ctl.NewGenerateConfigCommand(os.Stdin, os.Stdout, os.Stderr)
+	confCmd := &cobra.Command{
+		Use:   "generate-config",
+		Short: "Print the default configuration.",
+		Long: `generate-config prints the default configuration to stdout
+`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if err := GenerateConf.Run(context.Background()); err != nil {
+				return err
+			}
+			return nil
+		},
+	}
+
+	return confCmd
+}
+
+func init() {
+	subcommandFns["generate-config"] = NewGenerateConfigCommand
+}

cmd/server.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/pilosa/pilosa/ctl"
 	"github.com/pilosa/pilosa/server"
 )
 
@@ -85,23 +86,9 @@ on the configured port.`,
 			return nil
 		},
 	}
-	flags := serveCmd.Flags()
-
-	flags.StringVarP(&Server.Config.DataDir, "data-dir", "d", "~/.pilosa", "Directory to store pilosa data files.")
-	flags.StringVarP(&Server.Config.Host, "bind", "b", ":10101", "Default URI on which pilosa should listen.")
-	flags.IntVarP(&Server.Config.MaxWritesPerRequest, "max-writes-per-request", "", Server.Config.MaxWritesPerRequest, "Number of write commands per request.")
-	flags.IntVarP(&Server.Config.Cluster.ReplicaN, "cluster.replicas", "", 1, "Number of hosts each piece of data should be stored on.")
-	flags.StringSliceVarP(&Server.Config.Cluster.Hosts, "cluster.hosts", "", []string{}, "Comma separated list of hosts in cluster.")
-	flags.StringSliceVarP(&Server.Config.Cluster.InternalHosts, "cluster.internal-hosts", "", []string{}, "Comma separated list of hosts in cluster used for internal communication.")
-	flags.DurationVarP((*time.Duration)(&Server.Config.Cluster.PollingInterval), "cluster.poll-interval", "", time.Minute, "Polling interval for cluster.") // TODO what actually is this?
-	flags.StringVarP(&Server.Config.Plugins.Path, "plugins.path", "", "", "Path to plugin directory.")
-	flags.StringVar(&Server.Config.LogPath, "log-path", "", "Log path")
-	flags.DurationVarP((*time.Duration)(&Server.Config.AntiEntropy.Interval), "anti-entropy.interval", "", time.Minute*10, "Interval at which to run anti-entropy routine.")
-	flags.StringVarP(&Server.CPUProfile, "profile.cpu", "", "", "Where to store CPU profile.")
-	flags.DurationVarP(&Server.CPUTime, "profile.cpu-time", "", 30*time.Second, "CPU profile duration.")
-	flags.StringVarP(&Server.Config.Cluster.Type, "cluster.type", "", "static", "Determine how the cluster handles membership and state sharing. Choose from [static, http, gossip]")
-	flags.StringVarP(&Server.Config.Cluster.GossipSeed, "cluster.gossip-seed", "", "", "Host with which to seed the gossip membership.")
-	flags.StringVarP(&Server.Config.Cluster.InternalPort, "cluster.internal-port", "", "", "Port to which pilosa should bind for internal state sharing.")
+
+	// Attach flags to the command.
+	ctl.BuildServerFlags(serveCmd, Server)
 
 	return serveCmd
 }

ctl/config.go

@@ -18,14 +18,15 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"strings"
 
+	toml "github.com/pelletier/go-toml"
 	"github.com/pilosa/pilosa"
 )
 
 // ConfigCommand represents a command for printing a default config.
 type ConfigCommand struct {
 	*pilosa.CmdIO
+	Config *pilosa.Config
 }
 
 // NewConfigCommand returns a new instance of ConfigCommand.
@@ -37,27 +38,10 @@ func NewConfigCommand(stdin io.Reader, stdout, stderr io.Writer) *ConfigCommand
 
 // Run prints out the default config.
 func (cmd *ConfigCommand) Run(ctx context.Context) error {
-	fmt.Fprintln(cmd.Stdout, strings.TrimSpace(`
-data-dir = "~/.pilosa"
-bind = "localhost:10101"
-max-writes-per-request = 5000
-
-[cluster]
-  poll-interval = "2m0s"
-  replicas = 1
-  hosts = [
-    "localhost:10101",
-  ]
-
-[anti-entropy]
-  interval = "10m0s"
-
-[profile]
-  cpu = ""
-  cpu-time = "30s"
-
-[plugins]
-  path = ""
-`)+"\n")
+	buf, err := toml.Marshal(*cmd.Config)
+	if err != nil {
+		return err
+	}
+	fmt.Fprintln(cmd.Stdout, string(buf))
 	return nil
 }

ctl/generate_config.go

@@ -0,0 +1,63 @@
+// Copyright 2017 Pilosa Corp.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ctl
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/pilosa/pilosa"
+)
+
+// GenerateConfigCommand represents a command for printing a default config.
+type GenerateConfigCommand struct {
+	*pilosa.CmdIO
+}
+
+// NewGenerateConfigCommand returns a new instance of GenerateConfigCommand.
+func NewGenerateConfigCommand(stdin io.Reader, stdout, stderr io.Writer) *GenerateConfigCommand {
+	return &GenerateConfigCommand{
+		CmdIO: pilosa.NewCmdIO(stdin, stdout, stderr),
+	}
+}
+
+// Run prints out the default config.
+func (cmd *GenerateConfigCommand) Run(ctx context.Context) error {
+	fmt.Fprintln(cmd.Stdout, strings.TrimSpace(`
+data-dir = "~/.pilosa"
+bind = "localhost:10101"
+max-writes-per-request = 5000
+
+[cluster]
+  poll-interval = "2m0s"
+  replicas = 1
+  hosts = [
+    "localhost:10101",
+  ]
+
+[anti-entropy]
+  interval = "10m0s"
+
+[profile]
+  cpu = ""
+  cpu-time = "30s"
+
+[plugins]
+  path = ""
+`)+"\n")
+	return nil
+}

ctl/server.go

@@ -0,0 +1,42 @@
+// Copyright 2017 Pilosa Corp.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ctl
+
+import (
+	"time"
+
+	"github.com/pilosa/pilosa/server"
+	"github.com/spf13/cobra"
+)
+
+// BuildServerFlags attaches a set of flags to the command for a server instance.
+func BuildServerFlags(cmd *cobra.Command, srv *server.Command) {
+	flags := cmd.Flags()
+	flags.StringVarP(&srv.Config.DataDir, "data-dir", "d", "~/.pilosa", "Directory to store pilosa data files.")
+	flags.StringVarP(&srv.Config.Host, "bind", "b", ":10101", "Default URI on which pilosa should listen.")
+	flags.IntVarP(&srv.Config.MaxWritesPerRequest, "max-writes-per-request", "", srv.Config.MaxWritesPerRequest, "Number of write commands per request.")
+	flags.IntVarP(&srv.Config.Cluster.ReplicaN, "cluster.replicas", "", 1, "Number of hosts each piece of data should be stored on.")
+	flags.StringSliceVarP(&srv.Config.Cluster.Hosts, "cluster.hosts", "", []string{}, "Comma separated list of hosts in cluster.")
+	flags.StringSliceVarP(&srv.Config.Cluster.InternalHosts, "cluster.internal-hosts", "", []string{}, "Comma separated list of hosts in cluster used for internal communication.")
+	flags.DurationVarP((*time.Duration)(&srv.Config.Cluster.PollingInterval), "cluster.poll-interval", "", time.Minute, "Polling interval for cluster.") // TODO what actually is this?
+	flags.StringVarP(&srv.Config.Plugins.Path, "plugins.path", "", "", "Path to plugin directory.")
+	flags.StringVar(&srv.Config.LogPath, "log-path", "", "Log path")
+	flags.DurationVarP((*time.Duration)(&srv.Config.AntiEntropy.Interval), "anti-entropy.interval", "", time.Minute*10, "Interval at which to run anti-entropy routine.")
+	flags.StringVarP(&srv.CPUProfile, "profile.cpu", "", "", "Where to store CPU profile.")
+	flags.DurationVarP(&srv.CPUTime, "profile.cpu-time", "", 30*time.Second, "CPU profile duration.")
+	flags.StringVarP(&srv.Config.Cluster.Type, "cluster.type", "", "static", "Determine how the cluster handles membership and state sharing. Choose from [static, http, gossip]")
+	flags.StringVarP(&srv.Config.Cluster.GossipSeed, "cluster.gossip-seed", "", "", "Host with which to seed the gossip membership.")
+	flags.StringVarP(&srv.Config.Cluster.InternalPort, "cluster.internal-port", "", "", "Port to which pilosa should bind for internal state sharing.")
+}