From bd643853859724d6ceba26d69dc41f5461dfe744 Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 29 Jul 2014 16:37:54 +0200
Subject: [PATCH] Move available connectors listing to `facette' cmd

---
 cmd/facette/facette.go       | 15 +++++++++++++++
 cmd/facettectl/facettectl.go |  2 +-
 cmd/facettectl/service.go    | 22 ----------------------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/cmd/facette/facette.go b/cmd/facette/facette.go
index a6d21cc2..ceeb9724 100644
--- a/cmd/facette/facette.go
+++ b/cmd/facette/facette.go
@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"sort"
 	"syscall"
 
+	"github.com/facette/facette/pkg/connector"
 	"github.com/facette/facette/pkg/logger"
 	"github.com/facette/facette/pkg/server"
 	"github.com/facette/facette/pkg/utils"
@@ -44,6 +46,19 @@ func init() {
 		utils.PrintUsage(os.Stdout, cmdUsage)
 	} else if flagVersion {
 		utils.PrintVersion(version)
+
+		connectors := []string{}
+		for connector := range connector.Connectors {
+			connectors = append(connectors, connector)
+		}
+
+		sort.Strings(connectors)
+
+		fmt.Printf("\nAvailable connectors:\n")
+		for _, connector := range connectors {
+			fmt.Printf("   %s\n", connector)
+		}
+
 		os.Exit(0)
 	} else if flagConfig == "" {
 		fmt.Fprintf(os.Stderr, "Error: configuration file path is mandatory\n")
diff --git a/cmd/facettectl/facettectl.go b/cmd/facettectl/facettectl.go
index b80b2163..dc931d6d 100644
--- a/cmd/facettectl/facettectl.go
+++ b/cmd/facettectl/facettectl.go
@@ -61,7 +61,7 @@ func main() {
 	}
 
 	switch flag.Args()[0] {
-	case "reload", "support":
+	case "reload":
 		handler = handleService
 	default:
 		utils.PrintUsage(os.Stderr, cmdUsage)
diff --git a/cmd/facettectl/service.go b/cmd/facettectl/service.go
index 8c1e84e1..e561db8b 100644
--- a/cmd/facettectl/service.go
+++ b/cmd/facettectl/service.go
@@ -4,13 +4,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"sort"
 	"strconv"
 	"strings"
 	"syscall"
 
 	"github.com/facette/facette/pkg/config"
-	"github.com/facette/facette/pkg/connector"
 )
 
 func handleService(config *config.Config, args []string) error {
@@ -19,8 +17,6 @@ func handleService(config *config.Config, args []string) error {
 	switch args[0] {
 	case "reload":
 		return cmd.reload(args[1:])
-	case "support":
-		return cmd.support(args[1:])
 	}
 
 	return nil
@@ -53,21 +49,3 @@ func (cmd *cmdServer) reload(args []string) error {
 
 	return syscall.Kill(pid, syscall.SIGHUP)
 }
-
-func (cmd *cmdServer) support(args []string) error {
-	fmt.Println("Provider connectors:")
-
-	keys := []string{}
-
-	for key := range connector.Connectors {
-		keys = append(keys, key)
-	}
-
-	sort.Strings(keys)
-
-	for key := range connector.Connectors {
-		fmt.Printf("   %s\n", key)
-	}
-
-	return nil
-}