From c1dab17fb3a94d8e325017dd0c10663abceb3147 Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@mumak.net>
Date: Mon, 4 Jul 2016 13:30:23 +0100
Subject: [PATCH] Make expiration a Duration

---
 app/multitenant/memcache_client.go | 6 +++---
 prog/app.go                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/multitenant/memcache_client.go b/app/multitenant/memcache_client.go
index 591de0db7..f82ec8966 100644
--- a/app/multitenant/memcache_client.go
+++ b/app/multitenant/memcache_client.go
@@ -56,10 +56,10 @@ type MemcacheClient struct {
 // MemcacheConfig defines how a MemcacheClient should be constructed.
 type MemcacheConfig struct {
 	Host           string
-	Timeout        time.Duration
 	Service        string
+	Timeout        time.Duration
 	UpdateInterval time.Duration
-	Expiration     int32
+	Expiration     time.Duration
 }
 
 // NewMemcacheClient creates a new MemcacheClient that gets its server list
@@ -72,7 +72,7 @@ func NewMemcacheClient(config MemcacheConfig) *MemcacheClient {
 	newClient := &MemcacheClient{
 		client:     client,
 		serverList: &servers,
-		expiration: config.Expiration,
+		expiration: int32(config.Expiration.Seconds()),
 		hostname:   config.Host,
 		service:    config.Service,
 		quit:       make(chan struct{}),
diff --git a/prog/app.go b/prog/app.go
index 1230c6b5f..3435cd235 100644
--- a/prog/app.go
+++ b/prog/app.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	memcacheExpiration     = 15 // seconds
+	memcacheExpiration     = 15 * time.Second
 	memcacheUpdateInterval = 1 * time.Minute
 )