Merge branch 'hide-log' into 'master'

日志太多了, 隐藏一些非stream的吧

See merge request !86

Author: timfeirg

rpc/counter.go

@@ -11,15 +11,19 @@ import (
 
 // 增加一个任务, 在任务调用之前要调用一次.
 // 否则任务不被追踪, 不保证任务能够正常完成.
-func (v *virbranium) taskAdd(name string) {
-	log.Infof("task [%s] added", name)
+func (v *virbranium) taskAdd(name string, verbose bool) {
+	if verbose {
+		log.Infof("task [%s] added", name)
+	}
 	v.counter.Add(1)
 }
 
 // 完成一个任务, 在任务执行完之后调用一次.
 // 否则计数器用完不会为0, 你也别想退出这个进程了.
-func (v *virbranium) taskDone(name string) {
-	log.Infof("task [%s] done", name)
+func (v *virbranium) taskDone(name string, verbose bool) {
+	if verbose {
+		log.Infof("task [%s] done", name)
+	}
 	v.counter.Done()
 }
 

rpc/rpc.go

@@ -23,8 +23,8 @@ type virbranium struct {
 
 // ListPods returns a list of pods
 func (v *virbranium) ListPods(ctx context.Context, empty *pb.Empty) (*pb.Pods, error) {
-	v.taskAdd("ListPods")
-	defer v.taskDone("ListPods")
+	v.taskAdd("ListPods", false)
+	defer v.taskDone("ListPods", false)
 
 	ps, err := v.cluster.ListPods()
 	if err != nil {
@@ -42,8 +42,8 @@ func (v *virbranium) ListPods(ctx context.Context, empty *pb.Empty) (*pb.Pods, e
 
 // AddPod saves a pod, and returns it to client
 func (v *virbranium) AddPod(ctx context.Context, opts *pb.AddPodOptions) (*pb.Pod, error) {
-	v.taskAdd("AddPod")
-	defer v.taskDone("AddPod")
+	v.taskAdd("AddPod", false)
+	defer v.taskDone("AddPod", false)
 
 	p, err := v.cluster.AddPod(opts.Name, opts.Desc)
 	if err != nil {
@@ -55,8 +55,8 @@ func (v *virbranium) AddPod(ctx context.Context, opts *pb.AddPodOptions) (*pb.Po
 
 // GetPod
 func (v *virbranium) GetPod(ctx context.Context, opts *pb.GetPodOptions) (*pb.Pod, error) {
-	v.taskAdd("GetPod")
-	defer v.taskDone("GetPod")
+	v.taskAdd("GetPod", false)
+	defer v.taskDone("GetPod", false)
 
 	p, err := v.cluster.GetPod(opts.Name)
 	if err != nil {
@@ -69,8 +69,8 @@ func (v *virbranium) GetPod(ctx context.Context, opts *pb.GetPodOptions) (*pb.Po
 // AddNode saves a node and returns it to client
 // Method must be called synchronously, or nothing will be returned
 func (v *virbranium) AddNode(ctx context.Context, opts *pb.AddNodeOptions) (*pb.Node, error) {
-	v.taskAdd("AddNode")
-	defer v.taskDone("AddNode")
+	v.taskAdd("AddNode", false)
+	defer v.taskDone("AddNode", false)
 
 	n, err := v.cluster.AddNode(opts.Nodename, opts.Endpoint, opts.Podname, opts.Cafile, opts.Certfile, opts.Keyfile, opts.Public)
 	if err != nil {
@@ -83,8 +83,8 @@ func (v *virbranium) AddNode(ctx context.Context, opts *pb.AddNodeOptions) (*pb.
 // AddNode saves a node and returns it to client
 // Method must be called synchronously, or nothing will be returned
 func (v *virbranium) RemoveNode(ctx context.Context, opts *pb.RemoveNodeOptions) (*pb.Pod, error) {
-	v.taskAdd("RemoveNode")
-	defer v.taskDone("RemoveNode")
+	v.taskAdd("RemoveNode", false)
+	defer v.taskDone("RemoveNode", false)
 
 	p, err := v.cluster.RemoveNode(opts.Nodename, opts.Podname)
 	if err != nil {
@@ -96,8 +96,8 @@ func (v *virbranium) RemoveNode(ctx context.Context, opts *pb.RemoveNodeOptions)
 
 // GetNode
 func (v *virbranium) GetNode(ctx context.Context, opts *pb.GetNodeOptions) (*pb.Node, error) {
-	v.taskAdd("GetNode")
-	defer v.taskDone("GetNode")
+	v.taskAdd("GetNode", false)
+	defer v.taskDone("GetNode", false)
 
 	n, err := v.cluster.GetNode(opts.Podname, opts.Nodename)
 	if err != nil {
@@ -109,8 +109,8 @@ func (v *virbranium) GetNode(ctx context.Context, opts *pb.GetNodeOptions) (*pb.
 
 // ListPodNodes returns a list of node for pod
 func (v *virbranium) ListPodNodes(ctx context.Context, opts *pb.ListNodesOptions) (*pb.Nodes, error) {
-	v.taskAdd("ListPodNodes")
-	defer v.taskDone("ListPodNodes")
+	v.taskAdd("ListPodNodes", false)
+	defer v.taskDone("ListPodNodes", false)
 
 	ns, err := v.cluster.ListPodNodes(opts.Podname, opts.All)
 	if err != nil {
@@ -127,8 +127,8 @@ func (v *virbranium) ListPodNodes(ctx context.Context, opts *pb.ListNodesOptions
 // GetContainer
 // More information will be shown
 func (v *virbranium) GetContainer(ctx context.Context, id *pb.ContainerID) (*pb.Container, error) {
-	v.taskAdd("GetContainer")
-	defer v.taskDone("GetContainer")
+	v.taskAdd("GetContainer", false)
+	defer v.taskDone("GetContainer", false)
 
 	container, err := v.cluster.GetContainer(id.Id)
 	if err != nil {
@@ -151,8 +151,8 @@ func (v *virbranium) GetContainer(ctx context.Context, id *pb.ContainerID) (*pb.
 // GetContainers
 // like GetContainer, information should be returned
 func (v *virbranium) GetContainers(ctx context.Context, cids *pb.ContainerIDs) (*pb.Containers, error) {
-	v.taskAdd("GetContainers")
-	defer v.taskDone("GetContainers")
+	v.taskAdd("GetContainers", false)
+	defer v.taskDone("GetContainers", false)
 
 	ids := []string{}
 	for _, id := range cids.Ids {
@@ -183,8 +183,8 @@ func (v *virbranium) GetContainers(ctx context.Context, cids *pb.ContainerIDs) (
 
 // list networks for pod
 func (v *virbranium) ListNetworks(ctx context.Context, opts *pb.GetPodOptions) (*pb.Networks, error) {
-	v.taskAdd("ListNetworks")
-	defer v.taskDone("ListNetworks")
+	v.taskAdd("ListNetworks", false)
+	defer v.taskDone("ListNetworks", false)
 
 	networks, err := v.cluster.ListNetworks(opts.Name)
 	if err != nil {
@@ -200,8 +200,8 @@ func (v *virbranium) ListNetworks(ctx context.Context, opts *pb.GetPodOptions) (
 
 // set node availability
 func (v *virbranium) SetNodeAvailable(ctx context.Context, opts *pb.NodeAvailable) (*pb.Node, error) {
-	v.taskAdd("SetNodeAvailable")
-	defer v.taskDone("SetNodeAvailable")
+	v.taskAdd("SetNodeAvailable", false)
+	defer v.taskDone("SetNodeAvailable", false)
 
 	n, err := v.cluster.SetNodeAvailable(opts.Podname, opts.Nodename, opts.Available)
 	if err != nil {
@@ -213,7 +213,7 @@ func (v *virbranium) SetNodeAvailable(ctx context.Context, opts *pb.NodeAvailabl
 // streamed returned functions
 // caller must ensure that timeout will not be too short because these actions take a little time
 func (v *virbranium) BuildImage(opts *pb.BuildImageOptions, stream pb.CoreRPC_BuildImageServer) error {
-	v.taskAdd("BuildImage")
+	v.taskAdd("BuildImage", true)
 
 	ch, err := v.cluster.BuildImage(opts.Repo, opts.Version, opts.Uid, opts.Artifact)
 	if err != nil {
@@ -227,7 +227,7 @@ func (v *virbranium) BuildImage(opts *pb.BuildImageOptions, stream pb.CoreRPC_Bu
 				// 如果send出错, 需要这里读完channel, 那么其实是走了另外一个函数来结束这个调用.
 				// 于是需要这里补一个done.
 				// 下面都一样
-				defer v.taskDone("BuildImage")
+				defer v.taskDone("BuildImage", true)
 				for r := range ch {
 					log.Infof("[BuildImage] Unsent streamed message: %v", r)
 				}
@@ -237,12 +237,12 @@ func (v *virbranium) BuildImage(opts *pb.BuildImageOptions, stream pb.CoreRPC_Bu
 	}
 	// 如果send没有出错, 那么说明可以完整读完这个channel
 	// 正常done就可以了, 这里不能defer, 不然会两次done.
-	v.taskDone("BuildImage")
+	v.taskDone("BuildImage", true)
 	return nil
 }
 
 func (v *virbranium) CreateContainer(opts *pb.DeployOptions, stream pb.CoreRPC_CreateContainerServer) error {
-	v.taskAdd("CreateContainer")
+	v.taskAdd("CreateContainer", true)
 
 	specs, err := types.LoadSpecs(opts.Specs)
 	if err != nil {
@@ -257,7 +257,7 @@ func (v *virbranium) CreateContainer(opts *pb.DeployOptions, stream pb.CoreRPC_C
 	for m := range ch {
 		if err := stream.Send(toRPCCreateContainerMessage(m)); err != nil {
 			go func() {
-				defer v.taskDone("CreateContainer")
+				defer v.taskDone("CreateContainer", true)
 				for r := range ch {
 					log.Infof("[CreateContainer] Unsent streamed message: %v", r)
 				}
@@ -266,12 +266,12 @@ func (v *virbranium) CreateContainer(opts *pb.DeployOptions, stream pb.CoreRPC_C
 		}
 	}
 
-	v.taskDone("CreateContainer")
+	v.taskDone("CreateContainer", true)
 	return nil
 }
 
 func (v *virbranium) RunAndWait(opts *pb.DeployOptions, stream pb.CoreRPC_RunAndWaitServer) error {
-	v.taskAdd("RunAndWait")
+	v.taskAdd("RunAndWait", true)
 
 	specs, err := types.LoadSpecs(opts.Specs)
 	if err != nil {
@@ -286,7 +286,7 @@ func (v *virbranium) RunAndWait(opts *pb.DeployOptions, stream pb.CoreRPC_RunAnd
 	for m := range ch {
 		if err := stream.Send(toRPCRunAndWaitMessage(m)); err != nil {
 			go func() {
-				defer v.taskDone("RunAndWait")
+				defer v.taskDone("RunAndWait", true)
 				for r := range ch {
 					log.Infof("[RunAndWait] Unsent streamed message: %v", r.Data)
 				}
@@ -295,12 +295,12 @@ func (v *virbranium) RunAndWait(opts *pb.DeployOptions, stream pb.CoreRPC_RunAnd
 		}
 	}
 
-	v.taskDone("RunAndWait")
+	v.taskDone("RunAndWait", true)
 	return nil
 }
 
 func (v *virbranium) UpgradeContainer(opts *pb.UpgradeOptions, stream pb.CoreRPC_UpgradeContainerServer) error {
-	v.taskAdd("UpgradeContainer")
+	v.taskAdd("UpgradeContainer", true)
 
 	ids := []string{}
 	for _, id := range opts.Ids {
@@ -315,7 +315,7 @@ func (v *virbranium) UpgradeContainer(opts *pb.UpgradeOptions, stream pb.CoreRPC
 	for m := range ch {
 		if err := stream.Send(toRPCUpgradeContainerMessage(m)); err != nil {
 			go func() {
-				defer v.taskDone("UpgradeContainer")
+				defer v.taskDone("UpgradeContainer", true)
 				for r := range ch {
 					log.Infof("[UpgradeContainer] Unsent streamed message: %v", r)
 				}
@@ -324,12 +324,12 @@ func (v *virbranium) UpgradeContainer(opts *pb.UpgradeOptions, stream pb.CoreRPC
 		}
 	}
 
-	v.taskDone("UpgradeContainer")
+	v.taskDone("UpgradeContainer", true)
 	return nil
 }
 
 func (v *virbranium) RemoveContainer(cids *pb.ContainerIDs, stream pb.CoreRPC_RemoveContainerServer) error {
-	v.taskAdd("RemoveContainer")
+	v.taskAdd("RemoveContainer", true)
 
 	ids := []string{}
 	for _, id := range cids.Ids {
@@ -348,7 +348,7 @@ func (v *virbranium) RemoveContainer(cids *pb.ContainerIDs, stream pb.CoreRPC_Re
 	for m := range ch {
 		if err := stream.Send(toRPCRemoveContainerMessage(m)); err != nil {
 			go func() {
-				defer v.taskDone("RemoveContainer")
+				defer v.taskDone("RemoveContainer", true)
 				for r := range ch {
 					log.Infof("[RemoveContainer] Unsent streamed message: %v", r)
 				}
@@ -357,12 +357,12 @@ func (v *virbranium) RemoveContainer(cids *pb.ContainerIDs, stream pb.CoreRPC_Re
 		}
 	}
 
-	v.taskDone("RemoveContainer")
+	v.taskDone("RemoveContainer", true)
 	return nil
 }
 
 func (v *virbranium) RemoveImage(opts *pb.RemoveImageOptions, stream pb.CoreRPC_RemoveImageServer) error {
-	v.taskAdd("RemoveImage")
+	v.taskAdd("RemoveImage", true)
 
 	ch, err := v.cluster.RemoveImage(opts.Podname, opts.Nodename, opts.Images)
 	if err != nil {
@@ -372,7 +372,7 @@ func (v *virbranium) RemoveImage(opts *pb.RemoveImageOptions, stream pb.CoreRPC_
 	for m := range ch {
 		if err := stream.Send(toRPCRemoveImageMessage(m)); err != nil {
 			go func() {
-				defer v.taskDone("RemoveImage")
+				defer v.taskDone("RemoveImage", true)
 				for r := range ch {
 					log.Infof("[RemoveImage] Unsent streamed message: %v", r)
 				}
@@ -381,13 +381,13 @@ func (v *virbranium) RemoveImage(opts *pb.RemoveImageOptions, stream pb.CoreRPC_
 		}
 	}
 
-	v.taskDone("RemoveImage")
+	v.taskDone("RemoveImage", true)
 	return nil
 }
 
 func (v *virbranium) Backup(ctx context.Context, opts *pb.BackupOptions) (*pb.BackupMessage, error) {
-	v.taskAdd("Backup")
-	defer v.taskDone("Backup")
+	v.taskAdd("Backup", false)
+	defer v.taskDone("Backup", false)
 
 	backupMessage, err := v.cluster.Backup(opts.Id, opts.SrcPath)
 	if err != nil {