Consolidating more codebase and cleanup in server / controller

controller-main.go

@@ -16,7 +16,17 @@
 
 package main
 
-import "github.com/minio/cli"
+import (
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/minio/cli"
+	"github.com/minio/minio/pkg/minhttp"
+	"github.com/minio/minio/pkg/probe"
+)
 
 var controllerCmd = cli.Command{
 	Name:   "controller",
@@ -35,11 +45,51 @@ EXAMPLES:
 `,
 }
 
+// getRPCServer instance
+func getRPCServer(rpcHandler http.Handler) (*http.Server, *probe.Error) {
+	// Minio server config
+	httpServer := &http.Server{
+		Addr:           ":9001", // TODO make this configurable
+		Handler:        rpcHandler,
+		MaxHeaderBytes: 1 << 20,
+	}
+	var hosts []string
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return nil, probe.NewError(err)
+	}
+	for _, addr := range addrs {
+		if addr.Network() == "ip+net" {
+			host := strings.Split(addr.String(), "/")[0]
+			if ip := net.ParseIP(host); ip.To4() != nil {
+				hosts = append(hosts, host)
+			}
+		}
+	}
+	for _, host := range hosts {
+		fmt.Printf("Starting minio server on: http://%s:9001/rpc, PID: %d\n", host, os.Getpid())
+	}
+	return httpServer, nil
+}
+
+// startController starts a minio controller
+func startController() *probe.Error {
+	rpcServer, err := getRPCServer(getRPCHandler())
+	if err != nil {
+		return err.Trace()
+	}
+	// Setting rate limit to 'zero' no ratelimiting implemented
+	if err := minhttp.ListenAndServeLimited(0, rpcServer); err != nil {
+		return err.Trace()
+	}
+	return nil
+}
+
 func controllerMain(c *cli.Context) {
 	if c.Args().Present() {
 		cli.ShowCommandHelpAndExit(c, "controller", 1)
 	}
 
-	err := StartController()
+	err := startController()
 	errorIf(err.Trace(), "Failed to start minio controller.", nil)
 }