From a23e016527331eadabdf6ce74e5d9f29b3d306ef Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 28 Dec 2014 12:02:31 +0000
Subject: [PATCH] go vet fixes
---
cmd/radioctl/radioctl.go | 2 +-
fe/loadbalancing.go | 2 +-
instrumentation/stats.go | 4 ++--
node/icecast_config.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd/radioctl/radioctl.go b/cmd/radioctl/radioctl.go
index 73d3835e..a40999d0 100644
--- a/cmd/radioctl/radioctl.go
+++ b/cmd/radioctl/radioctl.go
@@ -314,7 +314,7 @@ func init() {
func usage() {
fmt.Fprintf(os.Stderr, "Usage: %s\n\nGlobal options:\n", cmdr.UsageLine)
flag.PrintDefaults()
- fmt.Fprintln(os.Stderr, "\nType \"radioctl help\" for more documentation.\n")
+ fmt.Fprintf(os.Stderr, "\nType \"radioctl help\" for more documentation.\n\n")
}
func main() {
diff --git a/fe/loadbalancing.go b/fe/loadbalancing.go
index a6676947..fdbd10a1 100644
--- a/fe/loadbalancing.go
+++ b/fe/loadbalancing.go
@@ -39,7 +39,7 @@ func (wlp weightedListenersPolicy) GetNode(nodes []*autoradio.NodeStatus) *autor
weightBase := 1000000
for _, n := range nodes {
w := weightBase / (n.NumListeners() + 1)
- choices = append(choices, randutil.Choice{w, n})
+ choices = append(choices, randutil.Choice{Weight: w, Item: n})
}
result, err := randutil.WeightedChoice(choices)
if err != nil {
diff --git a/instrumentation/stats.go b/instrumentation/stats.go
index 333d0b6c..6ed23abf 100644
--- a/instrumentation/stats.go
+++ b/instrumentation/stats.go
@@ -24,7 +24,7 @@ var (
func init() {
hostname, err := os.Hostname()
if err != nil {
- log.Fatal("Could not determine hostname: %v", err)
+ log.Fatalf("Could not determine hostname: %v", err)
}
prefix = fmt.Sprintf("autoradio.%s.", hostname)
}
@@ -33,7 +33,7 @@ func getClient() *statsd.Client {
clientInit.Do(func() {
c, err := statsd.New(*statsdServer, prefix)
if err != nil {
- log.Fatal("Error initializing instrumentation: %v", err)
+ log.Fatalf("Error initializing instrumentation: %v", err)
}
client = c
})
diff --git a/node/icecast_config.go b/node/icecast_config.go
index c9174b9e..a63e748f 100644
--- a/node/icecast_config.go
+++ b/node/icecast_config.go
@@ -151,7 +151,7 @@ func newIcecastConfig(publicIp string) *icecastConfig {
adminPw := getIcecastAdminPassword()
return &icecastConfig{
- XMLName: xml.Name{"", "icecast"},
+ XMLName: xml.Name{Local: "icecast"},
Limits: iceLimitsConfig{
Clients: maxClients,
Sources: maxClients / 2,
--
GitLab