serverrpc: remove duplicated logs

After bd66e67
(serverrpc.NewServerRPC: set unaryLoger and streamLoger as grpc interceptors),
most of grpc log can be outputted in unaryLoger and streamLoger.

Remove duplicated logs.

Signed-off-by: Hui Zhu <[email protected]>

Author: teawater

serverrpc/attach.go

@@ -14,7 +14,6 @@ func (s *ServerRPC) Attach(stream types.PublicAPI_AttachServer) error {
 	if err != nil {
 		return err
 	}
-	glog.V(3).Infof("Attach with request %s", req.String())
 
 	ir, iw := io.Pipe()
 	or, ow := io.Pipe()

serverrpc/container.go

@@ -1,90 +1,66 @@
 package serverrpc
 
 import (
-	"github.com/golang/glog"
 	"github.com/hyperhq/hyperd/types"
 	"golang.org/x/net/context"
 )
 
 // ContainerCreate creates a container by UserContainer spec
 func (s *ServerRPC) ContainerCreate(ctx context.Context, req *types.ContainerCreateRequest) (*types.ContainerCreateResponse, error) {
-	glog.V(3).Infof("ContainerCreate with request %s", req.String())
-
 	containerID, err := s.daemon.CreateContainerInPod(req.PodID, req.ContainerSpec)
 	if err != nil {
-		glog.Errorf("ContainerCreate failed %v with request %s: %v", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerCreate done with request %s", req.String())
-
 	return &types.ContainerCreateResponse{
 		ContainerID: containerID,
 	}, nil
 }
 
 func (s *ServerRPC) ContainerStart(ctx context.Context, req *types.ContainerStartRequest) (*types.ContainerStartResponse, error) {
-	glog.V(3).Info("ContainerStart with request %s", req.String())
 	err := s.daemon.StartContainer(req.ContainerId)
 	if err != nil {
-		glog.Errorf("ContainerStart failed %v with request %s", err, req.String())
 		return nil, err
 	}
-	glog.V(3).Info("ContainerStart done with request %s", req.String())
+
 	return &types.ContainerStartResponse{}, nil
 }
 
 // ContainerStop implements POST /container/stop
 func (s *ServerRPC) ContainerStop(c context.Context, req *types.ContainerStopRequest) (*types.ContainerStopResponse, error) {
-	glog.V(3).Infof("ContainerStop with request %v", req.String())
-
 	err := s.daemon.StopContainer(req.ContainerID, int(req.Timeout))
 	if err != nil {
-		glog.Errorf("ContainerStop failed %v with request %v", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerStop done with request %v", req.String())
-
 	return &types.ContainerStopResponse{}, nil
 }
 
 // ContainerRename rename a container
 func (s *ServerRPC) ContainerRename(c context.Context, req *types.ContainerRenameRequest) (*types.ContainerRenameResponse, error) {
-	glog.V(3).Infof("ContainerRename with request %v", req.String())
-
 	err := s.daemon.ContainerRename(req.OldContainerName, req.NewContainerName)
 	if err != nil {
-		glog.Errorf("ContainerRename failed %v with request %v", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerRename done with request %v", req.String())
-
 	return &types.ContainerRenameResponse{}, nil
 }
 
 func (s *ServerRPC) ContainerRemove(ctx context.Context, req *types.ContainerRemoveRequest) (*types.ContainerRemoveResponse, error) {
-	glog.V(3).Info("ContainerRemove with request %s", req.String())
 	err := s.daemon.RemoveContainer(req.ContainerId)
 	if err != nil {
-		glog.Errorf("ContainerRemove failed %v with request %s", err, req.String())
 		return nil, err
 	}
-	glog.V(3).Info("ContainerRemove done with request %s", req.String())
+
 	return &types.ContainerRemoveResponse{}, nil
 }
 
 // ContainerSignal sends a singal to specified container of specified pod
 func (s *ServerRPC) ContainerSignal(ctx context.Context, req *types.ContainerSignalRequest) (*types.ContainerSignalResponse, error) {
-	glog.V(3).Infof("ContainerSignal with request %s", req.String())
-
 	err := s.daemon.KillPodContainers(req.PodID, req.ContainerID, req.Signal)
 	if err != nil {
-		glog.Errorf("ContainerSignal failed %v done with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerSignal done with request %s", req.String())
 	return &types.ContainerSignalResponse{}, nil
 }

serverrpc/exec.go

@@ -11,22 +11,16 @@ import (
 )
 
 func (s *ServerRPC) ExecCreate(ctx context.Context, req *types.ExecCreateRequest) (*types.ExecCreateResponse, error) {
-	glog.V(3).Infof("ExecCreate with request %s", req.String())
-
 	cmd, err := json.Marshal(req.Command)
 	if err != nil {
 		return nil, err
 	}
 
 	execId, err := s.daemon.CreateExec(req.ContainerID, string(cmd), req.Tty)
 	if err != nil {
-		glog.Errorf("ExecCreate failed %v with request %s", err, req.String())
-
 		return nil, err
 	}
 
-	glog.V(3).Infof("ExecCreate done with request %s", req.String())
-
 	return &types.ExecCreateResponse{
 		ExecID: execId,
 	}, nil
@@ -95,32 +89,24 @@ func (s *ServerRPC) ExecStart(stream types.PublicAPI_ExecStartServer) error {
 
 // Wait gets exitcode by container and processId
 func (s *ServerRPC) Wait(c context.Context, req *types.WaitRequest) (*types.WaitResponse, error) {
-	glog.V(3).Infof("Wait with request %s", req.String())
-
 	//FIXME need update if param NoHang is enabled
 	code, err := s.daemon.ExitCode(req.Container, req.ProcessId)
 	if err != nil {
-		glog.Errorf("Wait failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("Wait done with request %s", req.String())
 	return &types.WaitResponse{
 		ExitCode: int32(code),
 	}, nil
 }
 
 // ExecSignal sends a singal to specified exec of specified container
 func (s *ServerRPC) ExecSignal(ctx context.Context, req *types.ExecSignalRequest) (*types.ExecSignalResponse, error) {
-	glog.V(3).Infof("ExecSignal with request %s", req.String())
-
 	err := s.daemon.KillExec(req.ContainerID, req.ExecID, req.Signal)
 	if err != nil {
-		glog.Errorf("ExecSignal failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ExecSignal done with request %s", req.String())
 	return &types.ExecSignalResponse{}, nil
 }
 

serverrpc/images.go

@@ -13,11 +13,8 @@ import (
 
 // ImageList implements GET /images/get
 func (s *ServerRPC) ImageList(ctx context.Context, req *types.ImageListRequest) (*types.ImageListResponse, error) {
-	glog.V(3).Infof("ImageList with request %s", req.String())
-
 	images, err := s.daemon.Daemon.Images(req.FilterArgs, req.Filter, req.All)
 	if err != nil {
-		glog.Errorf("ImageList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
@@ -34,16 +31,13 @@ func (s *ServerRPC) ImageList(ctx context.Context, req *types.ImageListRequest)
 		})
 	}
 
-	glog.V(3).Infof("ImageList done with request %s", req.String())
 	return &types.ImageListResponse{
 		ImageList: result,
 	}, nil
 }
 
 // ImagePull pulls a image from registry
 func (s *ServerRPC) ImagePull(req *types.ImagePullRequest, stream types.PublicAPI_ImagePullServer) error {
-	glog.V(3).Infof("ImagePull with request %s", req.String())
-
 	authConfig := &enginetypes.AuthConfig{}
 	if req.Auth != nil {
 		authConfig = &enginetypes.AuthConfig{
@@ -89,14 +83,11 @@ func (s *ServerRPC) ImagePull(req *types.ImagePullRequest, stream types.PublicAP
 	pullResult = s.daemon.CmdImagePull(req.Image, req.Tag, authConfig, nil, w)
 	complete = true
 
-	glog.V(3).Infof("ImagePull done with request %s", req.String())
 	return pullResult
 }
 
 // ImagePush pushes a local image to registry
 func (s *ServerRPC) ImagePush(req *types.ImagePushRequest, stream types.PublicAPI_ImagePushServer) error {
-	glog.V(3).Infof("ImagePush with request %s", req.String())
-
 	authConfig := &enginetypes.AuthConfig{}
 	if req.Auth != nil {
 		authConfig = &enginetypes.AuthConfig{
@@ -137,21 +128,16 @@ func (s *ServerRPC) ImagePush(req *types.ImagePushRequest, stream types.PublicAP
 		}
 	}
 
-	glog.V(3).Infof("ImagePush done with request %s", req.String())
 	return pushResult
 }
 
 // ImageRemove deletes a image from hyperd
 func (s *ServerRPC) ImageRemove(ctx context.Context, req *types.ImageRemoveRequest) (*types.ImageRemoveResponse, error) {
-	glog.V(3).Infof("ImageDelete with request %s", req.String())
-
 	resp, err := s.daemon.CmdImageDelete(req.Image, req.Force, req.Prune)
 	if err != nil {
-		glog.Errorf("ImageDelete failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ImageDelete done with request %s", req.String())
 	return &types.ImageRemoveResponse{
 		Images: resp,
 	}, nil

serverrpc/info.go

@@ -1,7 +1,6 @@
 package serverrpc
 
 import (
-	"github.com/golang/glog"
 	"github.com/hyperhq/hyperd/types"
 	"github.com/hyperhq/hyperd/utils"
 	"golang.org/x/net/context"
@@ -13,47 +12,35 @@ const (
 
 // PodInfo gets PodInfo by podID
 func (s *ServerRPC) PodInfo(c context.Context, req *types.PodInfoRequest) (*types.PodInfoResponse, error) {
-	glog.V(3).Infof("PodInfo with request %s", req.String())
-
 	info, err := s.daemon.GetPodInfo(req.PodID)
 	if err != nil {
-		glog.Errorf("PodInfo failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("PodInfo done with request %s info %+v", req.String(), info)
 	return &types.PodInfoResponse{
 		PodInfo: info,
 	}, nil
 }
 
 // ContainerInfo gets ContainerInfo by ID or name of container
 func (s *ServerRPC) ContainerInfo(c context.Context, req *types.ContainerInfoRequest) (*types.ContainerInfoResponse, error) {
-	glog.V(3).Infof("ContainerInfo with request %s", req.String())
-
 	info, err := s.daemon.GetContainerInfo(req.Container)
 	if err != nil {
-		glog.Errorf("ContainerInfo failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerInfo done with request %s info %+v", req.String(), info)
 	return &types.ContainerInfoResponse{
 		ContainerInfo: info,
 	}, nil
 }
 
 // Info gets CmdSystemInfo
 func (s *ServerRPC) Info(c context.Context, req *types.InfoRequest) (*types.InfoResponse, error) {
-	glog.V(3).Infof("Info with request %s", req.String())
-
 	info, err := s.daemon.CmdSystemInfo()
 	if err != nil {
-		glog.Errorf("Info failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("Info done with request %s", req.String())
 	return info, nil
 }
 

serverrpc/list.go

@@ -1,54 +1,41 @@
 package serverrpc
 
 import (
-	"github.com/golang/glog"
 	"github.com/hyperhq/hyperd/types"
 	"golang.org/x/net/context"
 )
 
 // ContainerList implements GET /list?item=container
 func (s *ServerRPC) ContainerList(ctx context.Context, req *types.ContainerListRequest) (*types.ContainerListResponse, error) {
-	glog.V(3).Infof("ContainerList with request %s", req.String())
-
 	containerList, err := s.daemon.ListContainers(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("ContainerList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("ContainerList done with request %s", req.String())
 	return &types.ContainerListResponse{
 		ContainerList: containerList,
 	}, nil
 }
 
 // PodList implements GET /list?item=pod
 func (s *ServerRPC) PodList(ctx context.Context, req *types.PodListRequest) (*types.PodListResponse, error) {
-	glog.V(3).Infof("PodList with request %s", req.String())
-
 	podList, err := s.daemon.ListPods(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("PodList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("PodList done with request %s", req.String())
 	return &types.PodListResponse{
 		PodList: podList,
 	}, nil
 }
 
 // VMList implements GET /list?item=vm
 func (s *ServerRPC) VMList(ctx context.Context, req *types.VMListRequest) (*types.VMListResponse, error) {
-	glog.V(3).Infof("VMList with request %s", req.String())
-
 	vmList, err := s.daemon.ListVMs(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("VmList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
-	glog.V(3).Infof("VMList done with request %s", req.String())
 	return &types.VMListResponse{
 		VmList: vmList,
 	}, nil

serverrpc/logs.go

@@ -12,8 +12,6 @@ import (
 )
 
 func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.PublicAPI_ContainerLogsServer) error {
-	glog.V(3).Infof("ContainerLogs with request %s", req.String())
-
 	var since time.Time
 	if req.Since != "" {
 		s, n, err := timetypes.ParseTimestamps(req.Since, 0)
@@ -71,6 +69,5 @@ func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.
 		}
 	}
 
-	glog.V(3).Infof("ContainerLogs done with request %s", req.String())
 	return nil
 }