Use glog local name instead of log

Author: smarterclayton

pkg/network/node/node.go

@@ -144,27 +144,27 @@ func New(c *OsdnNodeConfig) (network.NodeInterface, error) {
 	// we're ready yet
 	os.Remove(filepath.Join(cniDirPath, openshiftCNIFile))
 
-	log.Infof("Initializing SDN node of type %q with configured hostname %q (IP %q), iptables sync period %q", c.PluginName, c.Hostname, c.SelfIP, c.IPTablesSyncPeriod.String())
+	glog.Infof("Initializing SDN node of type %q with configured hostname %q (IP %q), iptables sync period %q", c.PluginName, c.Hostname, c.SelfIP, c.IPTablesSyncPeriod.String())
 	if c.Hostname == "" {
 		output, err := kexec.New().Command("uname", "-n").CombinedOutput()
 		if err != nil {
 			return nil, err
 		}
 		c.Hostname = strings.TrimSpace(string(output))
-		log.Infof("Resolved hostname to %q", c.Hostname)
+		glog.Infof("Resolved hostname to %q", c.Hostname)
 	}
 	if c.SelfIP == "" {
 		var err error
 		c.SelfIP, err = netutils.GetNodeIP(c.Hostname)
 		if err != nil {
-			log.V(5).Infof("Failed to determine node address from hostname %s; using default interface (%v)", c.Hostname, err)
+			glog.V(5).Infof("Failed to determine node address from hostname %s; using default interface (%v)", c.Hostname, err)
 			var defaultIP net.IP
 			defaultIP, err = kubeutilnet.ChooseHostInterface()
 			if err != nil {
 				return nil, err
 			}
 			c.SelfIP = defaultIP.String()
-			log.Infof("Resolved IP address to %q", c.SelfIP)
+			glog.Infof("Resolved IP address to %q", c.SelfIP)
 		}
 	}
 
@@ -227,10 +227,10 @@ func (node *OsdnNode) dockerPreCNICleanup() error {
 	// OpenShift-in-a-container case, so we work around that by sending
 	// the messages by hand.
 	if _, err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.Reload").CombinedOutput(); err != nil {
-		log.Error(err)
+		glog.Error(err)
 	}
 	if _, err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.RestartUnit", "string:'docker.service' string:'replace'").CombinedOutput(); err != nil {
-		log.Error(err)
+		glog.Error(err)
 	}
 
 	// Delete pre-CNI interfaces
@@ -246,7 +246,7 @@ func (node *OsdnNode) dockerPreCNICleanup() error {
 		return err
 	}
 
-	log.Infof("Cleaned up left-over openshift-sdn docker bridge and interfaces")
+	glog.Infof("Cleaned up left-over openshift-sdn docker bridge and interfaces")
 
 	return nil
 }
@@ -289,9 +289,9 @@ func (node *OsdnNode) killUpdateFailedPods(pods []kapi.Pod) error {
 			return err
 		}
 
-		log.V(5).Infof("Killing pod '%s/%s' sandbox due to failed restart", pod.Namespace, pod.Name)
+		glog.V(5).Infof("Killing pod '%s/%s' sandbox due to failed restart", pod.Namespace, pod.Name)
 		if err := node.runtimeService.StopPodSandbox(sandboxID); err != nil {
-			log.Warningf("Failed to kill pod '%s/%s' sandbox: %v", pod.Namespace, pod.Name, err)
+			glog.Warningf("Failed to kill pod '%s/%s' sandbox: %v", pod.Namespace, pod.Name, err)
 		}
 	}
 	return nil
@@ -316,7 +316,7 @@ func (node *OsdnNode) Start() error {
 	}
 	if err := node.networkInfo.CheckHostNetworks(hostIPNets); err != nil {
 		// checkHostNetworks() errors *should* be fatal, but we didn't used to check this, and we can't break (mostly-)working nodes on upgrade.
-		log.Errorf("Local networks conflict with SDN; this will eventually cause problems: %v", err)
+		glog.Errorf("Local networks conflict with SDN; this will eventually cause problems: %v", err)
 	}
 
 	node.localSubnetCIDR, err = node.getLocalSubnet()
@@ -358,7 +358,7 @@ func (node *OsdnNode) Start() error {
 		node.watchServices()
 	}
 
-	log.V(2).Infof("Starting openshift-sdn pod manager")
+	glog.V(2).Infof("Starting openshift-sdn pod manager")
 	if err := node.podManager.Start(cniserver.CNIServerSocketPath, node.localSubnetCIDR, node.networkInfo.ClusterNetworks); err != nil {
 		return err
 	}
@@ -376,7 +376,7 @@ func (node *OsdnNode) Start() error {
 				continue
 			}
 			if err := node.UpdatePod(p); err != nil {
-				log.Warningf("will restart pod '%s/%s' due to update failure on restart: %s", p.Namespace, p.Name, err)
+				glog.Warningf("will restart pod '%s/%s' due to update failure on restart: %s", p.Namespace, p.Name, err)
 				podsToKill = append(podsToKill, p)
 			} else if vnid, err := node.policy.GetVNID(p.Namespace); err == nil {
 				node.policy.EnsureVNIDRules(vnid)
@@ -387,7 +387,7 @@ func (node *OsdnNode) Start() error {
 		// we'll be able to set them up correctly
 		if len(podsToKill) > 0 {
 			if err := node.killUpdateFailedPods(podsToKill); err != nil {
-				log.Warningf("failed to restart pods that failed to update at startup: %v", err)
+				glog.Warningf("failed to restart pods that failed to update at startup: %v", err)
 			}
 		}
 	}
@@ -401,7 +401,7 @@ func (node *OsdnNode) Start() error {
 		gatherPeriodicMetrics(node.oc.ovs)
 	}, time.Minute*2)
 
-	log.V(2).Infof("openshift-sdn network plugin ready")
+	glog.V(2).Infof("openshift-sdn network plugin ready")
 
 	// Write our CNI config file out to disk to signal to kubelet that
 	// our network plugin is ready
@@ -484,7 +484,7 @@ func (node *OsdnNode) handleAddOrUpdateService(obj, oldObj interface{}, eventTyp
 		return
 	}
 
-	log.V(5).Infof("Watch %s event for Service %q", eventType, serv.Name)
+	glog.V(5).Infof("Watch %s event for Service %q", eventType, serv.Name)
 	oldServ, exists := oldObj.(*kapi.Service)
 	if exists {
 		if !isServiceChanged(oldServ, serv) {
@@ -495,7 +495,7 @@ func (node *OsdnNode) handleAddOrUpdateService(obj, oldObj interface{}, eventTyp
 
 	netid, err := node.policy.GetVNID(serv.Namespace)
 	if err != nil {
-		log.Errorf("Skipped adding service rules for serviceEvent: %v, Error: %v", eventType, err)
+		glog.Errorf("Skipped adding service rules for serviceEvent: %v, Error: %v", eventType, err)
 		return
 	}
 
@@ -505,7 +505,7 @@ func (node *OsdnNode) handleAddOrUpdateService(obj, oldObj interface{}, eventTyp
 
 func (node *OsdnNode) handleDeleteService(obj interface{}) {
 	serv := obj.(*kapi.Service)
-	log.V(5).Infof("Watch %s event for Service %q", watch.Deleted, serv.Name)
+	glog.V(5).Infof("Watch %s event for Service %q", watch.Deleted, serv.Name)
 	node.DeleteServiceRules(serv)
 }