summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-09-08 08:48:02 -0400
committerenahum <nahumhbl@gmail.com>2016-09-08 09:48:02 -0300
commitba2e131804cb28c9ae133aaafe24187243f6e2f3 (patch)
treef985bfab95538df0ffac4bff6b5a5830c9a3b266
parentc99db74390e98157acbee17e8286142eebbfe0f7 (diff)
downloadchat-ba2e131804cb28c9ae133aaafe24187243f6e2f3.tar.gz
chat-ba2e131804cb28c9ae133aaafe24187243f6e2f3.tar.bz2
chat-ba2e131804cb28c9ae133aaafe24187243f6e2f3.zip
Include build number in server version given to the client (#3984)
-rw-r--r--api/context.go2
-rw-r--r--api/web_hub.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/context.go b/api/context.go
index 37b426c21..b63005d64 100644
--- a/api/context.go
+++ b/api/context.go
@@ -150,7 +150,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId)
- w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v", model.CurrentVersion, utils.CfgHash))
+ w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash))
if einterfaces.GetClusterInterface() != nil {
w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId())
}
diff --git a/api/web_hub.go b/api/web_hub.go
index c4abc5a7a..452fa10f8 100644
--- a/api/web_hub.go
+++ b/api/web_hub.go
@@ -64,7 +64,7 @@ func (h *Hub) Register(webConn *WebConn) {
h.register <- webConn
msg := model.NewWebSocketEvent("", "", webConn.UserId, model.WEBSOCKET_EVENT_HELLO)
- msg.Add("server_version", fmt.Sprintf("%v.%v", model.CurrentVersion, utils.CfgHash))
+ msg.Add("server_version", fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash))
go Publish(msg)
}