From cef7a1aae4205ebf4fbd8958f1f870ff69759edf Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 16 Sep 2015 17:37:11 -0700 Subject: PLT-92 Adding server side versioning to the binary --- utils/config.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index 0eb8329d1..eed627448 100644 --- a/utils/config.go +++ b/utils/config.go @@ -11,6 +11,8 @@ import ( "strconv" l4g "code.google.com/p/log4go" + + "github.com/mattermost/platform/model" ) const ( @@ -26,7 +28,6 @@ type ServiceSettings struct { AllowTesting bool UseSSL bool Port string - Version string InviteSalt string PublicLinkSalt string ResetSalt string @@ -275,7 +276,10 @@ func getSanitizeOptions(c *Config) map[string]bool { func getClientProperties(c *Config) map[string]string { props := make(map[string]string) - props["Version"] = c.ServiceSettings.Version + props["Version"] = model.GetFullVersion() + props["BuildNumber"] = model.BUILD_NUMBER + props["BuildDate"] = model.BUILD_DATE + props["SiteName"] = c.ServiceSettings.SiteName props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail) props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail -- cgit v1.2.3-1-g7c22 From af4deb2369ee6251d7f49db1d67808b773dd9db7 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 17 Sep 2015 13:01:40 -0700 Subject: Making changes to versioning --- utils/config.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index eed627448..6fd3a9ca7 100644 --- a/utils/config.go +++ b/utils/config.go @@ -276,9 +276,10 @@ func getSanitizeOptions(c *Config) map[string]bool { func getClientProperties(c *Config) map[string]string { props := make(map[string]string) - props["Version"] = model.GetFullVersion() - props["BuildNumber"] = model.BUILD_NUMBER - props["BuildDate"] = model.BUILD_DATE + props["Version"] = model.CurrentVersion + props["BuildNumber"] = model.BuildNumber + props["BuildDate"] = model.BuildDate + props["BuildHash"] = model.BuildHash props["SiteName"] = c.ServiceSettings.SiteName props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail) -- cgit v1.2.3-1-g7c22