add a restart counter to the daemons

cmd/radiod/radiod.go

@@ -8,19 +8,21 @@ import (
 	"syscall"
 
 	"git.autistici.org/ale/autoradio"
+	"git.autistici.org/ale/autoradio/instrumentation"
 	"git.autistici.org/ale/autoradio/node"
 )
 
 var (
 	publicIp = flag.String("ip", "127.0.0.1", "Public IP for this machine")
-	netDev = flag.String("interface", "eth0", "Network interface to monitor for utilization")
-	bwLimit = flag.Int("bwlimit", 100, "Bandwidth usage limit (Mbps)")
+	netDev   = flag.String("interface", "eth0", "Network interface to monitor for utilization")
+	bwLimit  = flag.Int("bwlimit", 100, "Bandwidth usage limit (Mbps)")
 )
 
-
 func main() {
 	flag.Parse()
 
+	instrumentation.NewCounter("radiod.restarts").Incr()
+
 	client := autoradio.NewEtcdClient()
 	bwLimitBytes := float64(*bwLimit * 1000000 / 8)
 	n := node.NewRadioNode(*publicIp, *netDev, bwLimitBytes, client)
@@ -28,7 +30,7 @@ func main() {
 	// Set up a clean shutdown function on SIGTERM.
 	stopch := make(chan os.Signal)
 	go func() {
-		<- stopch
+		<-stopch
 		log.Printf("terminating...")
 		n.Stop()
 	}()

cmd/redirectord/redirectord.go

@@ -7,15 +7,16 @@ import (
 
 	"git.autistici.org/ale/autoradio"
 	"git.autistici.org/ale/autoradio/fe"
+	"git.autistici.org/ale/autoradio/instrumentation"
 )
 
 var (
-	domain = flag.String("domain", "", "DNS domain to serve")
-	dnsPort = flag.Int("dns-port", 53, "DNS port")
+	domain   = flag.String("domain", "", "DNS domain to serve")
+	dnsPort  = flag.Int("dns-port", 53, "DNS port")
 	httpPort = flag.Int("http-port", 80, "HTTP port")
 	publicIp = flag.String("ip", "127.0.0.1", "Public IP for this machine")
 
-	staticDir = flag.String("static-dir", "/usr/share/autoradio/htdocs/static", "Static content directory")
+	staticDir   = flag.String("static-dir", "/usr/share/autoradio/htdocs/static", "Static content directory")
 	templateDir = flag.String("template-dir", "/usr/share/autoradio/htdocs/templates", "HTML templates directory")
 
 	lbPolicy = flag.String("lb-policy", "weighted", "Load balancing policy (weighted, leastloaded)")
@@ -31,6 +32,8 @@ func main() {
 		log.Fatal("Must specify --domain")
 	}
 
+	instrumentation.NewCounter("redirectord.restarts").Incr()
+
 	client := autoradio.NewEtcdClient()
 	api := autoradio.NewRadioAPI(client)