diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-18 12:22:57 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-18 12:22:57 -0400 |
commit | 5a436fd447753124b3f7705ecb123ecf5762bc24 (patch) | |
tree | d0b37402b2eead725bf0e3d1de37727f64c01315 /utils/config.go | |
parent | 7caef4a7a7287433ed274c4f20d3593ea4065b66 (diff) | |
parent | c63da249640e50b1c93c5c5ff7b5d598aa737b1e (diff) | |
download | chat-5a436fd447753124b3f7705ecb123ecf5762bc24.tar.gz chat-5a436fd447753124b3f7705ecb123ecf5762bc24.tar.bz2 chat-5a436fd447753124b3f7705ecb123ecf5762bc24.zip |
Merge pull request #699 from mattermost/PLT-92
PLT-92 Adding server side versioning to the binary
Diffstat (limited to 'utils/config.go')
-rw-r--r-- | utils/config.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go index 0eb8329d1..6fd3a9ca7 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,11 @@ 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.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) props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail |