From 756c44c17d0e775bc795ab91af195315eed2b083 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <jaffee@umbel.com>
Date: Mon, 6 Mar 2017 10:19:50 -0600
Subject: [PATCH] fix bugs with pilosa server -config and remove dead code

---
 cmd/server.go    |  2 +-
 server/server.go | 65 +-----------------------------------------------
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/cmd/server.go b/cmd/server.go
index cc8bbec49..d31806eea 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -29,7 +29,7 @@ on the configured port.`,
 		fmt.Fprintf(serve.Stderr, "Pilosa %s, build time %s\n", server.Version, server.BuildTime)
 
 		// Parse command line arguments.
-		if err := serve.ParseFlags(os.Args[1:]); err != nil {
+		if err := serve.SetupConfig(args); err != nil {
 			fmt.Fprintln(serve.Stderr, err)
 			os.Exit(2)
 		}
diff --git a/server/server.go b/server/server.go
index bb151a37d..247d0efa9 100644
--- a/server/server.go
+++ b/server/server.go
@@ -2,14 +2,11 @@ package server
 
 import (
 	"errors"
-	"flag"
 	"fmt"
 	"io"
 	"math/rand"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"runtime/pprof"
 	"strings"
 	"time"
 
@@ -39,57 +36,6 @@ const (
 	DefaultDataDir = "~/.pilosa"
 )
 
-func mainz() {
-	serve := NewMain()
-	serve.Server.Handler.Version = Version
-	fmt.Fprintf(serve.Stderr, "Pilosa %s, build time %s\n", Version, BuildTime)
-
-	// Parse command line arguments.
-	if err := serve.ParseFlags(os.Args[1:]); err != nil {
-		fmt.Fprintln(serve.Stderr, err)
-		os.Exit(2)
-	}
-
-	// Start CPU profiling.
-	if serve.CPUProfile != "" {
-		f, err := os.Create(serve.CPUProfile)
-		if err != nil {
-			fmt.Fprintf(serve.Stderr, "create cpu profile: %v", err)
-			os.Exit(1)
-		}
-		defer f.Close()
-
-		fmt.Fprintln(serve.Stderr, "Starting cpu profile")
-		pprof.StartCPUProfile(f)
-		time.AfterFunc(serve.CPUTime, func() {
-			fmt.Fprintln(serve.Stderr, "Stopping cpu profile")
-			pprof.StopCPUProfile()
-			f.Close()
-		})
-	}
-
-	// Execute the program.
-	if err := serve.Run(); err != nil {
-		fmt.Fprintln(serve.Stderr, err)
-		fmt.Fprintln(serve.Stderr, "stopping profile")
-		os.Exit(1)
-	}
-
-	// First SIGKILL causes server to shut down gracefully.
-	c := make(chan os.Signal, 2)
-	signal.Notify(c, os.Interrupt)
-	sig := <-c
-	fmt.Fprintf(serve.Stderr, "Received %s; gracefully shutting down...\n", sig.String())
-
-	// Second signal causes a hard shutdown.
-	go func() { <-c; os.Exit(1) }()
-
-	if err := serve.Close(); err != nil {
-		fmt.Fprintln(serve.Stderr, err)
-		os.Exit(1)
-	}
-}
-
 // Main represents the main program execution.
 type Main struct {
 	Server *pilosa.Server
@@ -158,16 +104,7 @@ func (m *Main) Close() error {
 }
 
 // ParseFlags parses command line flags from args.
-func (m *Main) ParseFlags(args []string) error {
-	fs := flag.NewFlagSet("pilosa", flag.ContinueOnError)
-	fs.StringVar(&m.CPUProfile, "cpuprofile", "", "cpu profile")
-	fs.DurationVar(&m.CPUTime, "cputime", 30*time.Second, "cpu profile duration")
-	fs.StringVar(&m.ConfigPath, "config", "", "config path")
-	fs.SetOutput(m.Stderr)
-	if err := fs.Parse(args); err != nil {
-		return err
-	}
-
+func (m *Main) SetupConfig(args []string) error {
 	// Load config, if specified.
 	if m.ConfigPath != "" {
 		if _, err := toml.DecodeFile(m.ConfigPath, &m.Config); err != nil {