agent: handle more properties + tidy

Author: kornrunner

agent/agent.go

@@ -2,20 +2,24 @@ package agent
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/garyburd/redigo/redis"
 )
 
 type TwemproxyConfig struct {
-	Listen       string   `yaml:"listen,omitempty"`
-	Hash         string   `yaml:"hash,omitempty"`
-	Distribution string   `yaml:"distribution,omitempty"`
-	Redis        bool     `yaml:"redis,omitempty"`
-	RetryTimeout int      `yaml:"server_retry_timeout,omitempty"`
-	FailureLimit int      `yaml:"server_failure_limit,omitempty"`
-	Servers      []string `yaml:"servers,omitempty"`
+	Listen            string   `yaml:"listen,omitempty"`
+	Hash              string   `yaml:"hash,omitempty"`
+	Distribution      string   `yaml:"distribution,omitempty"`
+	AutoEjectHosts    bool     `yaml:"auto_eject_hosts,omitempty"`
+	Redis             bool     `yaml:"redis,omitempty"`
+	ServerConnections int      `yaml:"server_connections,omitempty"`
+	Timeout           int      `yaml:"timeout,omitempty"`
+	RetryTimeout      int      `yaml:"server_retry_timeout,omitempty"`
+	FailureLimit      int      `yaml:"server_failure_limit,omitempty"`
+	Servers           []string `yaml:"servers,omitempty"`
 }
 
 var twemproxyConfig map[string]TwemproxyConfig
@@ -60,7 +64,7 @@ func RestartTwemproxy() error {
 	Debug("Restarting Twemproxy.")
 	args := strings.Split(Settings.RestartArgs, string(' '))
 	cmd := exec.Command(Settings.RestartCommand, args...)
-	cmd.Env = append (os.Environ(), Settings.RestartEnv)
+	cmd.Env = append(os.Environ(), Settings.RestartEnv)
 	out, err := cmd.Output()
 
 	if err != nil {
@@ -77,7 +81,7 @@ func GetSentinel() (redis.Conn, error) {
 		c, err = redis.Dial("tcp", Settings.Sentinels[i])
 		if err == nil {
 			Debug(fmt.Sprintf("Connected to sentinel %s", Settings.Sentinels[i]))
-			break;
+			break
 		}
 		Debug(fmt.Sprintf("Sentinel %s is not reachable", Settings.Sentinels[i]))
 	}

agent/settings.go

@@ -8,13 +8,13 @@ import (
 type AgentSettings struct {
 	AgentConfigFile     string
 	Verbose             bool
-	TwemproxyPoolName   string `yaml:"twemproxy_pool_name"`
-	TwemproxyConfigFile string `yaml:"twemproxy_config_file"`
+	TwemproxyPoolName   string   `yaml:"twemproxy_pool_name"`
+	TwemproxyConfigFile string   `yaml:"twemproxy_config_file"`
 	Sentinels           []string `yaml:"sentinels"`
-	RestartCommand      string `yaml:"restart_command"`
-	RestartArgs         string `yaml:"restart_args"`
-	RestartEnv          string `yaml:"restart_env"`
-	LogFile             string `yaml:"log_file"`
+	RestartCommand      string   `yaml:"restart_command"`
+	RestartArgs         string   `yaml:"restart_args"`
+	RestartEnv          string   `yaml:"restart_env"`
+	LogFile             string   `yaml:"log_file"`
 }
 
 var Settings AgentSettings = AgentSettings{}

agent/util.go

@@ -1,10 +1,11 @@
 package agent
 
 import (
-	"log"
 	"fmt"
-	"os"
 	"io/ioutil"
+	"log"
+	"os"
+
 	"launchpad.net/goyaml"
 )
 
@@ -38,13 +39,13 @@ func WriteYaml(path string, obj interface{}) error {
 	if err != nil {
 		return err
 	}
-	tmp    := path + ".tmp"
+	tmp := path + ".tmp"
 	f, err := os.OpenFile(tmp, os.O_WRONLY|os.O_CREATE|os.O_SYNC, 0644)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
-	
+
 	_, err = f.Write(data)
 
 	if err != nil {

conf/nutcracker.yml

@@ -2,7 +2,10 @@ root:
   listen: 172.19.111.15:22121
   hash: fnv1a_64
   distribution: ketama
+  auto_eject_hosts: false
   redis: true
+  server_connections: 2
+  timeout: 500
   server_retry_timeout: 100
   server_failure_limit: 500
   servers: