From f4023e239a3018d08da902037be7146689939c93 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 11 Jan 2017 18:45:07 +0100 Subject: [PATCH] fix cluster log format - CLU prefix - don't use error messages as strings to be interpreted as format strings. that can mess up things. - no need for \n at the end --- cluster/cluster.go | 10 +++++----- cluster/config.go | 4 ++-- cluster/manager.go | 20 ++++++++++---------- cluster/node.go | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cluster/cluster.go b/cluster/cluster.go index f29649ced1..ac621e1ce0 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -61,14 +61,14 @@ func Stop() { } func Start() { - log.Info("Starting cluster on %s:%d", cfg.BindAddr, cfg.BindPort) + log.Info("CLU Start: Starting cluster on %s:%d", cfg.BindAddr, cfg.BindPort) list, err := memberlist.Create(cfg) if err != nil { - log.Fatal(4, "Failed to create memberlist: "+err.Error()) + log.Fatal(4, "CLU Start: Failed to create memberlist: %s", err.Error()) } data, err := json.Marshal(Manager.ThisNode()) if err != nil { - log.Fatal(4, "Failed to marshal ThisNode metadata to json. %s", err.Error()) + log.Fatal(4, "CLU Start: Failed to marshal ThisNode metadata to json: %s", err.Error()) } list.LocalNode().Meta = data @@ -79,9 +79,9 @@ func Start() { } n, err := list.Join(strings.Split(peersStr, ",")) if err != nil { - log.Fatal(4, "Failed to join cluster: "+err.Error()) + log.Fatal(4, "CLU Start: Failed to join cluster: %s", err.Error()) } - log.Info("joined to %d nodes in cluster\n", n) + log.Info("CLU Start: joined to %d nodes in cluster", n) } // return the list of nodes to broadcast requests to diff --git a/cluster/config.go b/cluster/config.go index 2c250d4aa4..e4153f14f7 100644 --- a/cluster/config.go +++ b/cluster/config.go @@ -28,12 +28,12 @@ func ConfigSetup() { func ConfigProcess() { if !validMode(mode) { - log.Fatal(4, "invalid cluster operating mode") + log.Fatal(4, "CLU Config: invalid cluster operating mode") } addr, err := net.ResolveTCPAddr("tcp", clusterBindAddr) if err != nil { - log.Fatal(4, "cluster-bind-addres is not a valid TCP address. %s", err.Error()) + log.Fatal(4, "CLU Config: cluster-bind-addres is not a valid TCP address: %s", err.Error()) } clusterHost = addr.IP diff --git a/cluster/manager.go b/cluster/manager.go index bc8cb07161..30b83569d0 100644 --- a/cluster/manager.go +++ b/cluster/manager.go @@ -46,11 +46,11 @@ func (c *ClusterManager) NotifyJoin(node *memberlist.Node) { if len(node.Meta) == 0 { return } - log.Info("Node %s with address %s has joined the cluster\n", node.Name, node.Addr.String()) + log.Info("CLU manager: Node %s with address %s has joined the cluster", node.Name, node.Addr.String()) peer := Node{} err := json.Unmarshal(node.Meta, &peer) if err != nil { - log.Error(3, "Failed to decode node meta from %s. %s", node.Name, err.Error()) + log.Error(3, "CLU manager: Failed to decode node meta from %s: %s", node.Name, err.Error()) return } peer.RemoteAddr = node.Addr.String() @@ -63,7 +63,7 @@ func (c *ClusterManager) NotifyJoin(node *memberlist.Node) { func (c *ClusterManager) NotifyLeave(node *memberlist.Node) { c.Lock() defer c.Unlock() - log.Info("Node %s has left the cluster\n", node.Name) + log.Info("CLU manager: Node %s has left the cluster", node.Name) delete(c.Peers, node.Name) } @@ -76,7 +76,7 @@ func (c *ClusterManager) NotifyUpdate(node *memberlist.Node) { peer := Node{} err := json.Unmarshal(node.Meta, &peer) if err != nil { - log.Error(3, "Failed to decode node meta from %s. %s", node.Name, err.Error()) + log.Error(3, "CLU manager: Failed to decode node meta from %s: %s", node.Name, err.Error()) // if the node is known, lets mark it as notReady until it starts sending valid data again. if p, ok := c.Peers[node.Name]; ok { p.State = NodeNotReady @@ -92,7 +92,7 @@ func (c *ClusterManager) NotifyUpdate(node *memberlist.Node) { peer.local = true } c.Peers[node.Name] = peer - log.Info("Node %s at %s has been updated - %s\n", node.Name, node.Addr.String(), node.Meta) + log.Info("CLU manager: Node %s at %s has been updated - %s", node.Name, node.Addr.String(), node.Meta) } func (c *ClusterManager) BroadcastUpdate() { @@ -109,7 +109,7 @@ func (c *ClusterManager) NodeMeta(limit int) []byte { meta, err := json.Marshal(c.node) c.RUnlock() if err != nil { - log.Fatal(4, err.Error()) + log.Fatal(4, "CLU manager: %s", err.Error()) } return meta } @@ -146,7 +146,7 @@ func (c *ClusterManager) LocalState(join bool) []byte { meta, err := json.Marshal(c.Peers) c.Unlock() if err != nil { - log.Fatal(4, err.Error()) + log.Fatal(4, "CLU manager: %s", err.Error()) } return meta } @@ -155,18 +155,18 @@ func (c *ClusterManager) MergeRemoteState(buf []byte, join bool) { knownPeers := make(map[string]Node) err := json.Unmarshal(buf, &knownPeers) if err != nil { - log.Error(3, "Unabled to decode remoteState message. %s", err.Error()) + log.Error(3, "CLU manager: Unable to decode remoteState message: %s", err.Error()) return } c.Lock() for name, meta := range knownPeers { if existing, ok := c.Peers[name]; ok { if meta.Updated.After(existing.Updated) { - log.Info("updated node meta found in state update for %s", meta.Name) + log.Info("CLU manager: updated node meta found in state update for %s", meta.Name) c.Peers[name] = meta } } else { - log.Info("new node found in state update. %s", meta.Name) + log.Info("CLU manager: new node found in state update. %s", meta.Name) c.Peers[name] = meta } } diff --git a/cluster/node.go b/cluster/node.go index 251ec1e4c7..c0269d08cb 100644 --- a/cluster/node.go +++ b/cluster/node.go @@ -115,7 +115,7 @@ func (n Node) Get(path string, query interface{}) ([]byte, error) { } rsp, err := client.Do(req) if err != nil { - log.Error(3, "Cluster Node: %s unreachable. %s", n.Name, err.Error()) + log.Error(3, "CLU Node: %s unreachable. %s", n.Name, err.Error()) return nil, NewError(http.StatusServiceUnavailable, fmt.Errorf("cluster node unavailable")) } return handleResp(rsp) @@ -136,7 +136,7 @@ func (n Node) Post(path string, body interface{}) ([]byte, error) { req.Header.Add("Content-Type", "application/json") rsp, err := client.Do(req) if err != nil { - log.Error(3, "Cluster Node: %s unreachable. %s", n.Name, err.Error()) + log.Error(3, "CLU Node: %s unreachable. %s", n.Name, err.Error()) return nil, NewError(http.StatusServiceUnavailable, fmt.Errorf("cluster node unavailable")) } return handleResp(rsp)