Move interval to variable

pkg/config/config.go

@@ -13,85 +13,98 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package config
+ package config
 
-import (
-	"flag"
-	"os"
-
-	log "github.com/sirupsen/logrus"
-)
-
-var Version = "undefined"
-
-func getenv(key string, default_value string) string {
-	value := os.Getenv(key)
-	if len(value) == 0 {
-		return default_value
-	}
-	return value
-}
-
-type Config struct {
-	AWSRegion string
-	// Frequency, in seconds, to poll for changes
-	Interval             int
-	KubeConfig           string
-	KubeMaster           string
-	MetricsListenAddress string
-	Provider             string
-}
-
-func DefaultConfig() *Config {
-	cfg := &Config{
-		AWSRegion:            "us-west-2",
-		Interval:             30,
-		KubeConfig:           "",
-		KubeMaster:           "",
-		MetricsListenAddress: "0.0.0.0:9999",
-		Provider:             "aws",
-	}
-	return cfg
-}
-
-func (cfg *Config) ParseFlags() error {
-	kubeConfig := flag.String("kube-config",
-		getenv("KUBE_CONFIG", ""),
-		"Path to kube config (~/.kube/config)")
-
-	kubeMaster := flag.String("master-url",
-		getenv("MASTER_URL", ""),
-		"Kubernetes Master URL (kubectl cluster-info)")
-
-	metricAddr := flag.String("metrics-url",
-		getenv("METRICS_URL", "0.0.0.0:9999"),
-		"Address where metrics/healthz should be served (localhost:9999)")
-
-	region := flag.String("region",
-		getenv("AWS_REGION", "us-west-2"),
-		"AWS Region (us-west-2)")
-
-	logLevelStr := flag.String("log-level",
-		getenv("LOG_LEVEL", "info"),
-		"Logrus log level (info)")
-
-	interval := flag.Int("interval", 30, "Polling interval")
-	flag.Parse()
-
-	// Override config values from CLI
-	cfg.AWSRegion = *region
-	cfg.Interval = *interval
-	cfg.KubeConfig = *kubeConfig
-	cfg.KubeMaster = *kubeMaster
-	cfg.MetricsListenAddress = *metricAddr
-	cfg.Provider = "aws"
-
-	logLevel, err := log.ParseLevel(*logLevelStr)
-	if err != nil {
-		log.Warnf("Improper log level provided: log-level=%s. Defaulting to log-level=info", *logLevelStr)
-		logLevel = log.InfoLevel
-	}
-	log.SetLevel(logLevel)
-
-	return nil
-}
+ import (
+	 "flag"
+	 "os"
+	 "strconv"
+
+	 log "github.com/sirupsen/logrus"
+ )
+
+ var Version = "undefined"
+
+ func getenv(key string, default_value string) string {
+	 value := os.Getenv(key)
+	 if len(value) == 0 {
+		 return default_value
+	 }
+	 return value
+ }
+
+ func getEnvAsInt(name string, defaultVal int) int {
+	 valueStr := getenv(name, "")
+	 if value, err := strconv.Atoi(valueStr); err == nil {
+	 return value
+	 }
+
+	 return defaultVal
+ }
+
+ type Config struct {
+	 AWSRegion string
+	 // Frequency, in seconds, to poll for changes
+	 Interval             int
+	 KubeConfig           string
+	 KubeMaster           string
+	 MetricsListenAddress string
+	 Provider             string
+ }
+
+ func DefaultConfig() *Config {
+	 cfg := &Config{
+		 AWSRegion:            "us-west-2",
+		 Interval:             30,
+		 KubeConfig:           "",
+		 KubeMaster:           "",
+		 MetricsListenAddress: "0.0.0.0:9999",
+		 Provider:             "aws",
+	 }
+	 return cfg
+ }
+
+ func (cfg *Config) ParseFlags() error {
+	 kubeConfig := flag.String("kube-config",
+		 getenv("KUBE_CONFIG", ""),
+		 "Path to kube config (~/.kube/config)")
+
+	 kubeMaster := flag.String("master-url",
+		 getenv("MASTER_URL", ""),
+		 "Kubernetes Master URL (kubectl cluster-info)")
+
+	 metricAddr := flag.String("metrics-url",
+		 getenv("METRICS_URL", "0.0.0.0:9999"),
+		 "Address where metrics/healthz should be served (localhost:9999)")
+
+	 region := flag.String("region",
+		 getenv("AWS_REGION", "us-west-2"),
+		 "AWS Region (us-west-2)")
+
+	 logLevelStr := flag.String("log-level",
+		 getenv("LOG_LEVEL", "info"),
+		 "Logrus log level (info)")
+
+	 interval := flag.Int("interval",
+		 getEnvAsInt("INTERVAL", 30),
+		 "Polling interval (30 seconds)")
+	 flag.Parse()
+
+	 // Override config values from CLI
+	 cfg.AWSRegion = *region
+	 cfg.Interval = *interval
+	 cfg.KubeConfig = *kubeConfig
+	 cfg.KubeMaster = *kubeMaster
+	 cfg.MetricsListenAddress = *metricAddr
+	 cfg.Provider = "aws"
+
+	 logLevel, err := log.ParseLevel(*logLevelStr)
+	 if err != nil {
+		 log.Warnf("Improper log level provided: log-level=%s. Defaulting to log-level=info", *logLevelStr)
+		 logLevel = log.InfoLevel
+	 }
+	 log.SetLevel(logLevel)
+
+	 return nil
+ }
+