Upgrade go-bindata to latest version

Makefile

@@ -1,8 +1,8 @@
 
 all: status.html.go
 
-status.html.go: status.html
-	go-bindata  -i status.html -o status.html.go.tmp -p main -f status_html
+status.html.go: templates/*.html
+	go-bindata  -o status.html.go.tmp templates/
 	@echo "// +build !devel\n" > status.html.go
 	@cat status.html.go.tmp >> status.html.go
 	@rm status.html.go.tmp

monitor.go

@@ -281,8 +281,13 @@ func StatusServer(zones Zones) func(http.ResponseWriter, *http.Request) {
 			}
 		}
 
-		tmpl := template.New("status_html")
-		tmpl, err := tmpl.Parse(string(status_html()))
+		statusTemplate, err := templates_status_html()
+		if err != nil {
+			log.Println("Could not read template", err)
+			w.WriteHeader(500)
+			return
+		}
+		tmpl, err := template.New("status_html").Parse(string(statusTemplate))
 
 		if err != nil {
 			str := fmt.Sprintf("Could not parse template: %s", err)

status.html.go

@@ -5,89 +5,124 @@ package main
 import (
 	"bytes"
 	"compress/gzip"
+	"fmt"
 	"io"
+	"strings"
 )
 
-// status_html returns raw, uncompressed file data.
-func status_html() []byte {
-	gz, err := gzip.NewReader(bytes.NewBuffer([]byte{
-0x1f,0x8b,0x08,0x00,0x00,0x09,0x6e,0x88,0x00,0xff,0xb4,0x57,
-0x4d,0x53,0xeb,0x36,0x14,0x5d,0x27,0xbf,0x42,0xe3,0x29,0xbb,
-0x22,0x13,0x4a,0x66,0x1a,0xea,0x78,0x03,0x0c,0x5d,0x34,0x14,
-0x9a,0xb6,0x8b,0xb7,0x53,0xac,0x9b,0xd8,0xf3,0x1c,0x29,0x4f,
-0x52,0x08,0xbc,0x4c,0xfe,0xfb,0xbb,0x92,0x3f,0x62,0x3b,0x26,
-0x04,0xbf,0x61,0x83,0xe5,0x23,0x9d,0x2b,0x9d,0x7b,0x4f,0xae,
-0x4c,0x10,0x9b,0x65,0x1a,0x06,0x31,0x30,0x1e,0x06,0x26,0x31,
-0x29,0x84,0xf7,0x20,0x6f,0x1f,0xa6,0x64,0xbb,0x25,0xf4,0x7f,
-0x50,0x3a,0x91,0x82,0xec,0x76,0x81,0x9f,0x4d,0xf6,0x83,0x34,
-0x11,0x5f,0x49,0xac,0x60,0x3e,0xf6,0x7c,0x5f,0x80,0xe1,0x82,
-0xd1,0x99,0x94,0x46,0x1b,0xc5,0x56,0x11,0x17,0x34,0x92,0x4b,
-0xdf,0x6c,0x12,0x63,0x40,0x9d,0x97,0x13,0xfe,0x25,0xfd,0x8d,
-0x0e,0xfc,0x48,0x6b,0xbf,0xc4,0xce,0x71,0xe5,0x2c,0x11,0xc0,
-0xe9,0x32,0x41,0x9a,0xd6,0x1e,0x51,0x90,0x8e,0x3d,0x6d,0x5e,
-0x53,0xd0,0x31,0x80,0xf1,0x4e,0xdd,0xcf,0x01,0x1b,0x66,0xa2,
-0xb8,0xd8,0x08,0xd4,0x3a,0x05,0x26,0xf6,0xbb,0x1d,0xdd,0xc4,
-0xbd,0x85,0xfd,0x9e,0xe1,0xf4,0xbb,0x14,0x20,0xd8,0x12,0x7e,
-0xc5,0xb1,0x4d,0x0b,0x28,0xb2,0x25,0x73,0x29,0xcc,0xf9,0x06,
-0x92,0x45,0x6c,0xae,0xc9,0x4c,0xa6,0xfc,0x0f,0xb2,0xeb,0x07,
-0x7e,0x4e,0x0b,0x66,0x92,0xbf,0x86,0xfd,0x7e,0xc0,0x93,0x67,
-0x12,0xa5,0x4c,0xeb,0xb1,0x17,0x21,0x83,0xa1,0x38,0xe5,0xd9,
-0x89,0x78,0x10,0xde,0xa7,0x72,0xc6,0xd2,0xc0,0xc7,0x61,0x7d,
-0xa5,0x92,0x1b,0xbb,0xa6,0x57,0xc5,0xf4,0x8a,0x89,0xdf,0x1d,
-0xda,0x0b,0x0c,0x9b,0xa5,0x50,0x4c,0x64,0x2f,0xee,0x2f,0x26,
-0x57,0xe1,0xe9,0x80,0xe7,0xaf,0xb8,0x23,0x07,0xa1,0x81,0x23,
-0xaf,0x67,0x79,0xca,0x3d,0x71,0xc0,0x0b,0x76,0x22,0xe6,0x92,
-0x64,0xa2,0xbc,0xfc,0x40,0x44,0x1b,0x66,0x34,0x96,0x97,0x97,
-0xab,0xc3,0x01,0xc1,0x5c,0xd5,0xa1,0xe1,0x21,0x34,0x68,0xc1,
-0x26,0x98,0xf2,0x12,0xc1,0x81,0x72,0x12,0x6a,0x67,0x09,0x9f,
-0xd6,0xa0,0x12,0x68,0x6c,0xb9,0xdd,0xae,0x54,0x22,0xcc,0x9c,
-0x78,0x67,0xf4,0x72,0xee,0x11,0x9a,0x9d,0x8e,0xe6,0x8b,0xe9,
-0x3f,0xcc,0xc0,0xc0,0xd9,0xf0,0x83,0xa4,0x61,0x17,0xd2,0xa0,
-0x13,0xcb,0x8a,0xaf,0xf0,0x32,0xf9,0xee,0x69,0xeb,0xf3,0xb9,
-0xc5,0xfc,0x33,0xd1,0x46,0x2e,0x14,0x5b,0x36,0xf2,0x3a,0x39,
-0x5a,0x21,0x87,0x8c,0x2e,0xce,0x1a,0xc0,0xe8,0x00,0xa0,0x4d,
-0x68,0xc2,0x5e,0xea,0xc0,0xd4,0xf0,0x5b,0x78,0x7e,0xaf,0xf6,
-0xb9,0xe7,0xbe,0xbd,0x63,0x01,0xee,0x11,0x52,0xa6,0xb8,0x94,
-0x46,0x51,0xcc,0xa9,0x75,0xa9,0x90,0xea,0x55,0x39,0x91,0xf5,
-0x18,0x99,0xd1,0x05,0xe9,0xc6,0x1b,0x75,0xe5,0x1d,0x25,0xbe,
-0x95,0x13,0xf6,0xf2,0xf1,0xdd,0xb2,0x62,0x91,0x03,0xb3,0xd6,
-0xdd,0x1a,0xf8,0xd8,0x91,0xda,0x3a,0xd3,0xd5,0x4f,0x75,0xa6,
-0xc2,0x10,0x15,0x2b,0x17,0x2e,0xfe,0x6f,0x65,0x92,0x25,0xec,
-0x0f,0xe5,0xc4,0xd0,0x0c,0xa5,0xb7,0xec,0x75,0x6a,0x50,0xd8,
-0x62,0x7f,0xec,0xf2,0x27,0xf6,0x76,0xc8,0xc7,0x94,0x99,0xb9,
-0x54,0xcb,0x66,0xd0,0x02,0x6f,0x09,0x76,0x98,0x81,0xf2,0x89,
-0xcd,0xfb,0x0b,0xde,0x0f,0x3a,0x6b,0xe3,0x9d,0x12,0xe0,0xce,
-0x1a,0x98,0x38,0xc4,0x7d,0xe2,0x6c,0xe4,0xfa,0xed,0xda,0xc0,
-0x1e,0x19,0xe6,0x88,0xae,0x2c,0x6a,0xc1,0xac,0xb7,0xc9,0xd3,
-0xe3,0x34,0x47,0xb2,0x1a,0xe2,0xc5,0xfd,0x8b,0x91,0xab,0xbf,
-0x31,0x6b,0x78,0x75,0x5f,0x8f,0x09,0xfd,0xb7,0x78,0xdb,0xed,
-0xec,0xb4,0x62,0x62,0x01,0xe8,0x25,0xa7,0x84,0x58,0xcc,0x26,
-0xb0,0xda,0x56,0xf2,0x3a,0x61,0x32,0x65,0x6a,0x0b,0x3e,0x1e,
-0x16,0xb3,0xc5,0xed,0xe8,0xd9,0x1c,0x3e,0xe0,0xa0,0xcc,0x5f,
-0xe1,0xa0,0xa0,0x28,0xc9,0x41,0xa7,0x6f,0xf5,0xe6,0x04,0xb0,
-0xa6,0x91,0x7e,0xab,0xd1,0x9f,0xcc,0x19,0x76,0xe0,0x0c,0xba,
-0x90,0x6a,0xfd,0xa4,0x45,0xf4,0x9d,0xfd,0x78,0xfa,0x88,0xf2,
-0x3b,0x2e,0x74,0x17,0xf5,0x4d,0xde,0xa9,0x62,0x0e,0xf6,0xeb,
-0x4a,0x6c,0xcd,0x84,0x75,0x5f,0x24,0xd7,0xc2,0x68,0x67,0xbd,
-0x82,0xfb,0x17,0x9b,0x41,0x3a,0xb5,0x9f,0x1a,0xd6,0x8d,0x37,
-0xd9,0x82,0x8a,0x4d,0x9d,0x0b,0x91,0x9b,0xcc,0x4b,0x3a,0x42,
-0xbd,0x56,0x63,0xd6,0x9d,0x19,0xba,0xd0,0xba,0xf9,0x2b,0x2e,
-0x6c,0x5e,0x8b,0xd6,0xb8,0x47,0xf3,0x10,0x57,0xd6,0xcb,0x2e,
-0x4a,0xae,0x26,0x6f,0x11,0xee,0x94,0x2d,0x17,0xfa,0x76,0x0b,
-0x82,0xdb,0x78,0xc5,0x20,0x57,0x9d,0x26,0xd0,0x94,0x7d,0xe3,
-0xb0,0x53,0x75,0xe7,0x01,0x4e,0x15,0x9e,0x05,0x3f,0xa2,0xbc,
-0x1a,0xef,0xb3,0xa4,0xf7,0xcb,0xd1,0xbe,0x6f,0xee,0xdb,0x66,
-0xf6,0x61,0x8c,0xdd,0xd2,0xfe,0x97,0xd1,0xff,0x11,0x00,0x00,
-0xff,0xff,0xb0,0x9d,0x52,0xc9,0x6d,0x0c,0x00,0x00,
-	}))
-
+func bindata_read(data []byte, name string) ([]byte, error) {
+	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
-		panic("Decompression failed: " + err.Error())
+		return nil, fmt.Errorf("Read %q: %v", name, err)
 	}
 
-	var b bytes.Buffer
-	io.Copy(&b, gz)
+	var buf bytes.Buffer
+	_, err = io.Copy(&buf, gz)
 	gz.Close()
 
-	return b.Bytes()
-}
+	if err != nil {
+		return nil, fmt.Errorf("Read %q: %v", name, err)
+	}
+
+	return buf.Bytes(), nil
+}
+
+func templates_status_html() ([]byte, error) {
+	return bindata_read([]byte{
+		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xb4, 0x57,
+		0x4d, 0x53, 0xeb, 0x36, 0x14, 0x5d, 0x27, 0xbf, 0x42, 0xe3, 0x29, 0xbb,
+		0x22, 0x13, 0x4a, 0x66, 0x1a, 0xea, 0x78, 0x03, 0x0c, 0x5d, 0x34, 0x14,
+		0x9a, 0xb6, 0x8b, 0xb7, 0x53, 0xac, 0x9b, 0xd8, 0xf3, 0x1c, 0x29, 0x4f,
+		0x52, 0x08, 0xbc, 0x4c, 0xfe, 0xfb, 0xbb, 0x92, 0x3f, 0x62, 0x3b, 0x26,
+		0x04, 0xbf, 0x61, 0x83, 0xe5, 0x23, 0x9d, 0x2b, 0x9d, 0x7b, 0x4f, 0xae,
+		0x4c, 0x10, 0x9b, 0x65, 0x1a, 0x06, 0x31, 0x30, 0x1e, 0x06, 0x26, 0x31,
+		0x29, 0x84, 0xf7, 0x20, 0x6f, 0x1f, 0xa6, 0x64, 0xbb, 0x25, 0xf4, 0x7f,
+		0x50, 0x3a, 0x91, 0x82, 0xec, 0x76, 0x81, 0x9f, 0x4d, 0xf6, 0x83, 0x34,
+		0x11, 0x5f, 0x49, 0xac, 0x60, 0x3e, 0xf6, 0x7c, 0x5f, 0x80, 0xe1, 0x82,
+		0xd1, 0x99, 0x94, 0x46, 0x1b, 0xc5, 0x56, 0x11, 0x17, 0x34, 0x92, 0x4b,
+		0xdf, 0x6c, 0x12, 0x63, 0x40, 0x9d, 0x97, 0x13, 0xfe, 0x25, 0xfd, 0x8d,
+		0x0e, 0xfc, 0x48, 0x6b, 0xbf, 0xc4, 0xce, 0x71, 0xe5, 0x2c, 0x11, 0xc0,
+		0xe9, 0x32, 0x41, 0x9a, 0xd6, 0x1e, 0x51, 0x90, 0x8e, 0x3d, 0x6d, 0x5e,
+		0x53, 0xd0, 0x31, 0x80, 0xf1, 0x4e, 0xdd, 0xcf, 0x01, 0x1b, 0x66, 0xa2,
+		0xb8, 0xd8, 0x08, 0xd4, 0x3a, 0x05, 0x26, 0xf6, 0xbb, 0x1d, 0xdd, 0xc4,
+		0xbd, 0x85, 0xfd, 0x9e, 0xe1, 0xf4, 0xbb, 0x14, 0x20, 0xd8, 0x12, 0x7e,
+		0xc5, 0xb1, 0x4d, 0x0b, 0x28, 0xb2, 0x25, 0x73, 0x29, 0xcc, 0xf9, 0x06,
+		0x92, 0x45, 0x6c, 0xae, 0xc9, 0x4c, 0xa6, 0xfc, 0x0f, 0xb2, 0xeb, 0x07,
+		0x7e, 0x4e, 0x0b, 0x66, 0x92, 0xbf, 0x86, 0xfd, 0x7e, 0xc0, 0x93, 0x67,
+		0x12, 0xa5, 0x4c, 0xeb, 0xb1, 0x17, 0x21, 0x83, 0xa1, 0x38, 0xe5, 0xd9,
+		0x89, 0x78, 0x10, 0xde, 0xa7, 0x72, 0xc6, 0xd2, 0xc0, 0xc7, 0x61, 0x7d,
+		0xa5, 0x92, 0x1b, 0xbb, 0xa6, 0x57, 0xc5, 0xf4, 0x8a, 0x89, 0xdf, 0x1d,
+		0xda, 0x0b, 0x0c, 0x9b, 0xa5, 0x50, 0x4c, 0x64, 0x2f, 0xee, 0x2f, 0x26,
+		0x57, 0xe1, 0xe9, 0x80, 0xe7, 0xaf, 0xb8, 0x23, 0x07, 0xa1, 0x81, 0x23,
+		0xaf, 0x67, 0x79, 0xca, 0x3d, 0x71, 0xc0, 0x0b, 0x76, 0x22, 0xe6, 0x92,
+		0x64, 0xa2, 0xbc, 0xfc, 0x40, 0x44, 0x1b, 0x66, 0x34, 0x96, 0x97, 0x97,
+		0xab, 0xc3, 0x01, 0xc1, 0x5c, 0xd5, 0xa1, 0xe1, 0x21, 0x34, 0x68, 0xc1,
+		0x26, 0x98, 0xf2, 0x12, 0xc1, 0x81, 0x72, 0x12, 0x6a, 0x67, 0x09, 0x9f,
+		0xd6, 0xa0, 0x12, 0x68, 0x6c, 0xb9, 0xdd, 0xae, 0x54, 0x22, 0xcc, 0x9c,
+		0x78, 0x67, 0xf4, 0x72, 0xee, 0x11, 0x9a, 0x9d, 0x8e, 0xe6, 0x8b, 0xe9,
+		0x3f, 0xcc, 0xc0, 0xc0, 0xd9, 0xf0, 0x83, 0xa4, 0x61, 0x17, 0xd2, 0xa0,
+		0x13, 0xcb, 0x8a, 0xaf, 0xf0, 0x32, 0xf9, 0xee, 0x69, 0xeb, 0xf3, 0xb9,
+		0xc5, 0xfc, 0x33, 0xd1, 0x46, 0x2e, 0x14, 0x5b, 0x36, 0xf2, 0x3a, 0x39,
+		0x5a, 0x21, 0x87, 0x8c, 0x2e, 0xce, 0x1a, 0xc0, 0xe8, 0x00, 0xa0, 0x4d,
+		0x68, 0xc2, 0x5e, 0xea, 0xc0, 0xd4, 0xf0, 0x5b, 0x78, 0x7e, 0xaf, 0xf6,
+		0xb9, 0xe7, 0xbe, 0xbd, 0x63, 0x01, 0xee, 0x11, 0x52, 0xa6, 0xb8, 0x94,
+		0x46, 0x51, 0xcc, 0xa9, 0x75, 0xa9, 0x90, 0xea, 0x55, 0x39, 0x91, 0xf5,
+		0x18, 0x99, 0xd1, 0x05, 0xe9, 0xc6, 0x1b, 0x75, 0xe5, 0x1d, 0x25, 0xbe,
+		0x95, 0x13, 0xf6, 0xf2, 0xf1, 0xdd, 0xb2, 0x62, 0x91, 0x03, 0xb3, 0xd6,
+		0xdd, 0x1a, 0xf8, 0xd8, 0x91, 0xda, 0x3a, 0xd3, 0xd5, 0x4f, 0x75, 0xa6,
+		0xc2, 0x10, 0x15, 0x2b, 0x17, 0x2e, 0xfe, 0x6f, 0x65, 0x92, 0x25, 0xec,
+		0x0f, 0xe5, 0xc4, 0xd0, 0x0c, 0xa5, 0xb7, 0xec, 0x75, 0x6a, 0x50, 0xd8,
+		0x62, 0x7f, 0xec, 0xf2, 0x27, 0xf6, 0x76, 0xc8, 0xc7, 0x94, 0x99, 0xb9,
+		0x54, 0xcb, 0x66, 0xd0, 0x02, 0x6f, 0x09, 0x76, 0x98, 0x81, 0xf2, 0x89,
+		0xcd, 0xfb, 0x0b, 0xde, 0x0f, 0x3a, 0x6b, 0xe3, 0x9d, 0x12, 0xe0, 0xce,
+		0x1a, 0x98, 0x38, 0xc4, 0x7d, 0xe2, 0x6c, 0xe4, 0xfa, 0xed, 0xda, 0xc0,
+		0x1e, 0x19, 0xe6, 0x88, 0xae, 0x2c, 0x6a, 0xc1, 0xac, 0xb7, 0xc9, 0xd3,
+		0xe3, 0x34, 0x47, 0xb2, 0x1a, 0xe2, 0xc5, 0xfd, 0x8b, 0x91, 0xab, 0xbf,
+		0x31, 0x6b, 0x78, 0x75, 0x5f, 0x8f, 0x09, 0xfd, 0xb7, 0x78, 0xdb, 0xed,
+		0xec, 0xb4, 0x62, 0x62, 0x01, 0xe8, 0x25, 0xa7, 0x84, 0x58, 0xcc, 0x26,
+		0xb0, 0xda, 0x56, 0xf2, 0x3a, 0x61, 0x32, 0x65, 0x6a, 0x0b, 0x3e, 0x1e,
+		0x16, 0xb3, 0xc5, 0xed, 0xe8, 0xd9, 0x1c, 0x3e, 0xe0, 0xa0, 0xcc, 0x5f,
+		0xe1, 0xa0, 0xa0, 0x28, 0xc9, 0x41, 0xa7, 0x6f, 0xf5, 0xe6, 0x04, 0xb0,
+		0xa6, 0x91, 0x7e, 0xab, 0xd1, 0x9f, 0xcc, 0x19, 0x76, 0xe0, 0x0c, 0xba,
+		0x90, 0x6a, 0xfd, 0xa4, 0x45, 0xf4, 0x9d, 0xfd, 0x78, 0xfa, 0x88, 0xf2,
+		0x3b, 0x2e, 0x74, 0x17, 0xf5, 0x4d, 0xde, 0xa9, 0x62, 0x0e, 0xf6, 0xeb,
+		0x4a, 0x6c, 0xcd, 0x84, 0x75, 0x5f, 0x24, 0xd7, 0xc2, 0x68, 0x67, 0xbd,
+		0x82, 0xfb, 0x17, 0x9b, 0x41, 0x3a, 0xb5, 0x9f, 0x1a, 0xd6, 0x8d, 0x37,
+		0xd9, 0x82, 0x8a, 0x4d, 0x9d, 0x0b, 0x91, 0x9b, 0xcc, 0x4b, 0x3a, 0x42,
+		0xbd, 0x56, 0x63, 0xd6, 0x9d, 0x19, 0xba, 0xd0, 0xba, 0xf9, 0x2b, 0x2e,
+		0x6c, 0x5e, 0x8b, 0xd6, 0xb8, 0x47, 0xf3, 0x10, 0x57, 0xd6, 0xcb, 0x2e,
+		0x4a, 0xae, 0x26, 0x6f, 0x11, 0xee, 0x94, 0x2d, 0x17, 0xfa, 0x76, 0x0b,
+		0x82, 0xdb, 0x78, 0xc5, 0x20, 0x57, 0x9d, 0x26, 0xd0, 0x94, 0x7d, 0xe3,
+		0xb0, 0x53, 0x75, 0xe7, 0x01, 0x4e, 0x15, 0x9e, 0x05, 0x3f, 0xa2, 0xbc,
+		0x1a, 0xef, 0xb3, 0xa4, 0xf7, 0xcb, 0xd1, 0xbe, 0x6f, 0xee, 0xdb, 0x66,
+		0xf6, 0x61, 0x8c, 0xdd, 0xd2, 0xfe, 0x97, 0xd1, 0xff, 0x11, 0x00, 0x00,
+		0xff, 0xff, 0xb0, 0x9d, 0x52, 0xc9, 0x6d, 0x0c, 0x00, 0x00,
+	},
+		"templates/status.html",
+	)
+}
+
+// Asset loads and returns the asset for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		return f()
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() ([]byte, error){
+	"templates/status.html": templates_status_html,
+}

templates_devel.go

@@ -7,11 +7,11 @@ import (
 	"log"
 )
 
-func status_html() []byte {
-	data, err := ioutil.ReadFile("status.html")
+func templates_status_html() ([]byte, error) {
+	data, err := ioutil.ReadFile("templates/status.html")
 	if err != nil {
 		log.Println("Could not open status.html", err)
-		return []byte{}
+		return nil, err
 	}
-	return data
+	return data, nil
 }