Supporting pretty print time.Duration (#33)

v3io · Dec 29, 2019 · 5e5378c · 5e5378c
1 parent 4557d66
commit 5e5378c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cmd/autoscaler/app/autoscaler.go b/cmd/autoscaler/app/autoscaler.go
@@ -21,7 +21,7 @@ func Run(kubeconfigPath string,
 	metricsGroupKind string) error {
 	autoScalerOptions := scaler_types.AutoScalerOptions{
 		Namespace:     namespace,
-		ScaleInterval: scaleInterval,
+		ScaleInterval: scaler_types.Duration{Duration: scaleInterval},
 		GroupKind:     metricsGroupKind,
 	}
 

diff --git a/cmd/dlx/app/dlx.go b/cmd/dlx/app/dlx.go
@@ -40,7 +40,7 @@ func Run(kubeconfigPath string,
 		TargetPort:               targetPort,
 		ListenAddress:            listenAddress,
 		Namespace:                namespace,
-		ResourceReadinessTimeout: resourceReadinessTimeoutDuration,
+		ResourceReadinessTimeout: scaler_types.Duration{Duration: resourceReadinessTimeoutDuration},
 	}
 
 	// see if resource scaler wants to override the arguments

diff --git a/pkg/autoscaler/autoscaler.go b/pkg/autoscaler/autoscaler.go
@@ -18,7 +18,7 @@ type Autoscaler struct {
 	logger                  logger.Logger
 	namespace               string
 	resourceScaler          scaler_types.ResourceScaler
-	scaleInterval           time.Duration
+	scaleInterval           scaler_types.Duration
 	inScaleToZeroProcessMap map[string]bool
 	groupKind               string
 	customMetricsClientSet  custommetricsv1.CustomMetricsClient
@@ -46,7 +46,7 @@ func NewAutoScaler(parentLogger logger.Logger,
 func (as *Autoscaler) Start() error {
 	as.logger.DebugWith("Starting",
 		"scaleInterval", as.scaleInterval)
-	ticker := time.NewTicker(as.scaleInterval)
+	ticker := time.NewTicker(as.scaleInterval.Duration)
 
 	go func() {
 		for range ticker.C {
@@ -154,8 +154,8 @@ func (as *Autoscaler) checkResourceToScale(resource scaler_types.Resource, resou
 func (as *Autoscaler) getMaxScaleResourceWindowSize(resource scaler_types.Resource) time.Duration {
 	maxWindow := 0 * time.Second
 	for _, scaleResource := range resource.ScaleResources {
-		if scaleResource.WindowSize > maxWindow {
-			maxWindow = scaleResource.WindowSize
+		if scaleResource.WindowSize.Duration > maxWindow {
+			maxWindow = scaleResource.WindowSize.Duration
 		}
 	}
 	return maxWindow

diff --git a/pkg/dlx/dlx.go b/pkg/dlx/dlx.go
@@ -19,7 +19,7 @@ func NewDLX(parentLogger logger.Logger,
 	options scaler_types.DLXOptions) (*DLX, error) {
 	childLogger := parentLogger.GetChild("dlx")
 	childLogger.InfoWith("Creating DLX", "options", options)
-	resourceStarter, err := NewResourceStarter(childLogger, resourceScaler, options.Namespace, options.ResourceReadinessTimeout)
+	resourceStarter, err := NewResourceStarter(childLogger, resourceScaler, options.Namespace, options.ResourceReadinessTimeout.Duration)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create function starter")
 	}