From 42f775af4f548aa6010504b91f749abd3ca5b310 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 13 Apr 2018 23:45:19 +0530 Subject: [PATCH] Add cache config for configuration comparison (#5812) --- cmd/config-current.go | 2 ++ cmd/config-versions.go | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/config-current.go b/cmd/config-current.go index 24a110724..e52d2e904 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -139,6 +139,8 @@ func (s *serverConfig) ConfigDiff(t *serverConfig) string { return "Domain configuration differs" case s.StorageClass != t.StorageClass: return "StorageClass configuration differs" + case !reflect.DeepEqual(s.Cache, t.Cache): + return "Cache configuration differs" case !reflect.DeepEqual(s.Notify.AMQP, t.Notify.AMQP): return "AMQP Notification configuration differs" case !reflect.DeepEqual(s.Notify.NATS, t.Notify.NATS): diff --git a/cmd/config-versions.go b/cmd/config-versions.go index 2aaf51c3a..82ec0e58c 100644 --- a/cmd/config-versions.go +++ b/cmd/config-versions.go @@ -580,7 +580,10 @@ type serverConfigV22 struct { Notify notifier `json:"notify"` } -// serverConfigV23 is just like version '22' with addition of cache field +// serverConfigV23 is just like version '22' with addition of cache field. +// +// IMPORTANT NOTE: When updating this struct make sure that +// serverConfig.ConfigDiff() is updated as necessary. type serverConfigV23 struct { Version string `json:"version"`