summaryrefslogtreecommitdiffstats
path: root/model/cluster_info.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-06-19 08:44:04 -0700
committerGitHub <noreply@github.com>2017-06-19 08:44:04 -0700
commit36f216cb7cb16958d98b3d77e121198596fd2213 (patch)
treeac2a5b79494749b3dffc2f5778092f2529c98d1a /model/cluster_info.go
parentfe48987a32fbd600458edd4e81318071ae558ba4 (diff)
downloadchat-36f216cb7cb16958d98b3d77e121198596fd2213.tar.gz
chat-36f216cb7cb16958d98b3d77e121198596fd2213.tar.bz2
chat-36f216cb7cb16958d98b3d77e121198596fd2213.zip
PLT-6080 moving clustering to memberlist (#6499)
* PLT-6080 adding cluster discovery service * Adding memberlist lib * Adding memberlist lib * WIP * WIP * WIP * WIP * Rolling back config changes * Fixing make file * Fixing config for cluster * WIP * Fixing system console for clustering * Fixing default config * Fixing config * Fixing system console for clustering * Tweaking hub setting * Bumping up time * merging vendor dir * Updating vendor dir * Fixing unit test * Fixing bad merge * Remove some testing code * Moving comment * PLT-6868 adding db ping retry * Removing unused loc strings * Adding defer to cancel
Diffstat (limited to 'model/cluster_info.go')
-rw-r--r--model/cluster_info.go49
1 files changed, 4 insertions, 45 deletions
diff --git a/model/cluster_info.go b/model/cluster_info.go
index f76a03c0b..1e468044e 100644
--- a/model/cluster_info.go
+++ b/model/cluster_info.go
@@ -7,24 +7,16 @@ import (
"encoding/json"
"io"
"strings"
- "sync"
- "sync/atomic"
)
type ClusterInfo struct {
- Id string `json:"id"`
- Version string `json:"version"`
- ConfigHash string `json:"config_hash"`
- InterNodeUrl string `json:"internode_url"`
- Hostname string `json:"hostname"`
- LastSuccessfulPing int64 `json:"last_ping"`
- Alive int32 `json:"is_alive"`
- Mutex sync.RWMutex `json:"-"`
+ Version string `json:"version"`
+ ConfigHash string `json:"config_hash"`
+ IpAddress string `json:"ipaddress"`
+ Hostname string `json:"hostname"`
}
func (me *ClusterInfo) ToJson() string {
- me.Mutex.RLock()
- defer me.Mutex.RUnlock()
b, err := json.Marshal(me)
if err != nil {
return ""
@@ -41,7 +33,6 @@ func (me *ClusterInfo) Copy() *ClusterInfo {
func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
decoder := json.NewDecoder(data)
var me ClusterInfo
- me.Mutex = sync.RWMutex{}
err := decoder.Decode(&me)
if err == nil {
return &me
@@ -50,38 +41,6 @@ func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
}
}
-func (me *ClusterInfo) SetAlive(alive bool) {
- if alive {
- atomic.StoreInt32(&me.Alive, 1)
- } else {
- atomic.StoreInt32(&me.Alive, 0)
- }
-}
-
-func (me *ClusterInfo) IsAlive() bool {
- return atomic.LoadInt32(&me.Alive) == 1
-}
-
-func (me *ClusterInfo) HaveEstablishedInitialContact() bool {
- me.Mutex.RLock()
- defer me.Mutex.RUnlock()
- if me.Id != "" {
- return true
- }
-
- return false
-}
-
-func (me *ClusterInfo) IdEqualTo(in string) bool {
- me.Mutex.RLock()
- defer me.Mutex.RUnlock()
- if me.Id == in {
- return true
- }
-
- return false
-}
-
func ClusterInfosToJson(objmap []*ClusterInfo) string {
if b, err := json.Marshal(objmap); err != nil {
return ""