Cleanup

Author: sgreben

Makefile

@@ -1,4 +1,4 @@
-VERSION = 4.0.0
+VERSION = 4.0.1
 
 PACKAGES := $(shell go list -f {{.Dir}} ./...)
 GOFILES  := $(addsuffix /*.go,$(PACKAGES))

cmd/tj/main.go

@@ -43,7 +43,14 @@ type configuration struct {
 	version      string
 }
 
-var config = configuration{}
+type printerFunc func(line *line) error
+
+var (
+	config       = configuration{}
+	printer      printerFunc
+	start        *regexp.Regexp
+	jsonTemplate *template.Template
+)
 
 var timeFormats = map[string]string{
 	"ANSIC":       time.ANSIC,
@@ -63,10 +70,6 @@ var timeFormats = map[string]string{
 	"StampNano":   time.StampNano,
 }
 
-type printerFunc func(line *line) error
-
-var printer printerFunc
-
 func jsonPrinter() printerFunc {
 	enc := json.NewEncoder(os.Stdout)
 	return func(line *line) error {
@@ -93,9 +96,6 @@ func timeFormatsHelp() string {
 	return buf.String()
 }
 
-var start *regexp.Regexp
-var jsonTemplate *template.Template
-
 func init() {
 	flag.StringVar(&config.template, "template", "", "go template (https://golang.org/pkg/text/template)")
 	flag.StringVar(&config.timeFormat, "timeformat", "RFC3339", timeFormatsHelp())