fix bugs.

Author: bobliu0909

cache/cache.go

@@ -493,13 +493,13 @@ func (cacheRepository *CacheRepository) CreateWorker(key string, node *gzkwrappe
 
 	worker := cacheRepository.nodeStore.GetWorker(key)
 	if worker != nil {
-		logger.WARN("[#cache#] %s create worker %s key is already, %s(%s).", node.Location, node.HostName, node.IpAddr)
+		logger.WARN("[#cache#] %s create worker %s is already, %s(%s).", node.Location, key, node.HostName, node.IpAddr)
 		return
 	}
 
-	ret := cacheRepository.nodeStore.ContainsLocationWorker(node.Location, node.IpAddr, node.HostName)
+	ret := cacheRepository.nodeStore.ContainsLocationWorker(node.Location, node.IpAddr)
 	if ret {
-		logger.WARN("[#cache#] %s create worker %s ip or host is already, %s(%s).", node.Location, node.HostName, node.IpAddr)
+		logger.WARN("[#cache#] %s create worker %s ipaddr is already, %s(%s).", node.Location, key, node.HostName, node.IpAddr)
 		return
 	}
 

cache/nodes.go

@@ -76,7 +76,7 @@ func (store *NodeStore) GetWorker(key string) *Worker {
 }
 
 //ContainsLocationWorker is exported
-func (store *NodeStore) ContainsLocationWorker(location string, ipaddr string, hostname string) bool {
+func (store *NodeStore) ContainsLocationWorker(location string, ipaddr string) bool {
 
 	store.RLock()
 	defer store.RUnlock()
@@ -87,11 +87,6 @@ func (store *NodeStore) ContainsLocationWorker(location string, ipaddr string, h
 					return true
 				}
 			}
-			if itHostName := strings.TrimSpace(worker.Name); itHostName != "" {
-				if strings.ToUpper(itHostName) == strings.ToUpper(hostname) {
-					return true
-				}
-			}
 		}
 	}
 	return false