diff options
Diffstat (limited to 'model/cluster_info.go')
| -rw-r--r-- | model/cluster_info.go | 49 |
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 "" |