summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
diff options
context:
space:
mode:
authorWim <wim@42.be>2021-10-17 00:47:22 +0200
committerGitHub <noreply@github.com>2021-10-17 00:47:22 +0200
commit4dd8bae5c91fa4aef09d865d8fef1acd84f90925 (patch)
treeffad9b242daccaf8c86d1c1fbd59032302bd3be9 /vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
parent7ae45c42e712bd0e66c101f3f714c05aa1dc2104 (diff)
downloadmatterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.tar.gz
matterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.tar.bz2
matterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.zip
Update dependencies (#1610)
* Update dependencies * Update module to go 1.17
Diffstat (limited to 'vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go')
-rw-r--r--vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
index 82437469..fc15d38c 100644
--- a/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
+++ b/vendor/github.com/mattermost/mattermost-server/v5/model/cluster_info.go
@@ -16,15 +16,15 @@ type ClusterInfo struct {
Hostname string `json:"hostname"`
}
-func (me *ClusterInfo) ToJson() string {
- b, _ := json.Marshal(me)
+func (ci *ClusterInfo) ToJson() string {
+ b, _ := json.Marshal(ci)
return string(b)
}
func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
- var me *ClusterInfo
- json.NewDecoder(data).Decode(&me)
- return me
+ var ci *ClusterInfo
+ json.NewDecoder(data).Decode(&ci)
+ return ci
}
func ClusterInfosToJson(objmap []*ClusterInfo) string {
@@ -38,7 +38,6 @@ func ClusterInfosFromJson(data io.Reader) []*ClusterInfo {
var objmap []*ClusterInfo
if err := decoder.Decode(&objmap); err != nil {
return make([]*ClusterInfo, 0)
- } else {
- return objmap
}
+ return objmap
}