remove wide scope variables

mackerelio · Oct 25, 2015 · 0c17944 · 0c17944
1 parent bf4d02f
commit 0c17944
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/check-mysql/connection.go b/check-mysql/connection.go
@@ -8,20 +8,21 @@ import (
 	"github.com/mackerelio/checkers"
 )
 
-var connectionOpts struct {
+type connectionOpts struct {
 	mysqlSetting
 	Crit int64 `short:"c" long:"critical" default:"250" description:"critical if the number of connection is over"`
 	Warn int64 `short:"w" long:"warning" default:"200" description:"warning if the number of connection is over"`
 }
 
 func checkConnection(args []string) *checkers.Checker {
-	psr := flags.NewParser(&connectionOpts, flags.Default)
+	opts := connectionOpts{}
+	psr := flags.NewParser(&opts, flags.Default)
 	psr.Usage = "connection [OPTIONS]"
 	_, err := psr.ParseArgs(args)
 	if err != nil {
 		os.Exit(1)
 	}
-	db := newMySQL(connectionOpts.mysqlSetting)
+	db := newMySQL(opts.mysqlSetting)
 	err = db.Connect()
 	if err != nil {
 		return checkers.Unknown("couldn't connect DB")
@@ -38,9 +39,9 @@ func checkConnection(args []string) *checkers.Checker {
 
 	checkSt := checkers.OK
 	msg := fmt.Sprintf("%d connections", threadsConnected)
-	if threadsConnected > connectionOpts.Crit {
+	if threadsConnected > opts.Crit {
 		checkSt = checkers.CRITICAL
-	} else if threadsConnected > connectionOpts.Warn {
+	} else if threadsConnected > opts.Warn {
 		checkSt = checkers.WARNING
 	}
 	return checkers.NewChecker(checkSt, msg)

diff --git a/check-mysql/replication.go b/check-mysql/replication.go
@@ -8,20 +8,21 @@ import (
 	"github.com/mackerelio/checkers"
 )
 
-var replicationOpts struct {
+type replicationOpts struct {
 	mysqlSetting
 	Crit int64 `short:"c" long:"critical" default:"250" description:"critical if the seconds behind master is over"`
 	Warn int64 `short:"w" long:"warning" default:"200" description:"warning if the seconds behind master is over"`
 }
 
 func checkReplication(args []string) *checkers.Checker {
-	psr := flags.NewParser(&replicationOpts, flags.Default)
+	opts := replicationOpts{}
+	psr := flags.NewParser(&opts, flags.Default)
 	psr.Usage = "replication [OPTIONS]"
 	_, err := psr.ParseArgs(args)
 	if err != nil {
 		os.Exit(1)
 	}
-	db := newMySQL(replicationOpts.mysqlSetting)
+	db := newMySQL(opts.mysqlSetting)
 	err = db.Connect()
 	if err != nil {
 		return checkers.Unknown("couldn't connect DB")
@@ -50,9 +51,9 @@ func checkReplication(args []string) *checkers.Checker {
 
 	checkSt := checkers.OK
 	msg := fmt.Sprintf("MySQL replication behind master %d seconds", secondsBehindMaster)
-	if secondsBehindMaster > replicationOpts.Crit {
+	if secondsBehindMaster > opts.Crit {
 		checkSt = checkers.CRITICAL
-	} else if secondsBehindMaster > replicationOpts.Warn {
+	} else if secondsBehindMaster > opts.Warn {
 		checkSt = checkers.WARNING
 	}
 	return checkers.NewChecker(checkSt, msg)