diff options
author | George Goldberg <george@gberg.me> | 2017-03-23 17:38:24 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-23 17:38:24 +0000 |
commit | c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3 (patch) | |
tree | a417d54a58edd244edb03935705618737cf2cf13 /app | |
parent | 120f5a6f8a5f4ab05aace89ae710698cf68d0564 (diff) | |
parent | 8ec37570742b67fd640bb3434ea226c655dbf408 (diff) | |
download | chat-c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3.tar.gz chat-c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3.tar.bz2 chat-c6ded1dbfd69a1da69add8d2b554f4b7dd0341b3.zip |
Merge branch 'release-3.7'
Diffstat (limited to 'app')
-rw-r--r-- | app/license.go | 4 | ||||
-rw-r--r-- | app/web_conn.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/license.go b/app/license.go index 87b2d1b05..1efaf85d5 100644 --- a/app/license.go +++ b/app/license.go @@ -76,6 +76,8 @@ func SaveLicense(licenseBytes []byte) (*model.License, *model.AppError) { return nil, model.NewLocAppError("addLicense", model.INVALID_LICENSE_ERROR, nil, "") } + ReloadConfig() + InvalidateAllCaches() return license, nil @@ -93,6 +95,8 @@ func RemoveLicense() *model.AppError { return result.Err } + ReloadConfig() + InvalidateAllCaches() return nil diff --git a/app/web_conn.go b/app/web_conn.go index 012236513..da6330f5c 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -178,7 +178,7 @@ func (webCon *WebConn) IsAuthenticated() bool { func (webCon *WebConn) SendHello() { msg := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_HELLO, "", "", webCon.UserId, nil) - msg.Add("server_version", fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash)) + msg.Add("server_version", fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed)) msg.DoPreComputeJson() webCon.Send <- msg } |