Merge branch 'lint-clean' into 'develop'

remove %v and simplify if-statement

See merge request cocsn/gosdn!39

nucleus/cli-handling.go

@@ -9,10 +9,10 @@ package nucleus
 
 import (
 	pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface"
+	"code.fbi.h-da.de/cocsn/gosdn/log"
 	"code.fbi.h-da.de/cocsn/gosdn/restconf/client/ciena"
 	"context"
 	"google.golang.org/grpc"
-	"code.fbi.h-da.de/cocsn/gosdn/log"
 	"net"
 )
 
@@ -23,12 +23,12 @@ type server struct {
 }
 
 func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
-	log.Info("Received: %v", in.GetName())
+	log.Info("Received: ", in.GetName())
 		return &pb.HelloReply{Message: "Hello " + in.GetName(), GoSDNInfo: "goSDN in version: DEVELOP"}, nil
 }
 
 func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) {
-	log.Info("Shutdown Received: %v", in.GetName())
+	log.Info("Shutdown Received: ", in.GetName())
 	s.core.IsRunning <- false
 	return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil
 }
@@ -38,21 +38,21 @@ func getCLIGoing(core *Core) {
 	// Boot-up the control interface for the cli
 	cliControlListener, err := net.Listen("tcp", core.config.CliSocket)
 	if err != nil {
-		log.Fatal("failed to listen: %v", err)
+		log.Fatal(err)
 	}
 
 	cliControlServer := grpc.NewServer()
 
 	pb.RegisterGrpcCliServer(cliControlServer, &server{core: core})
 	if err := cliControlServer.Serve(cliControlListener); err != nil {
-		log.Fatal("failed to serve: %v", err)
+		log.Fatal(err)
 	}
 	log.Info("Started: GetCLIGoing")
 }
 
 // SBI specific calls, by now TAPI only
 func (s *server) TAPIGetEdge(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
-	log.Info("Received: %v", in.GetName())
+	log.Info("Received: ", in.GetName())
 	if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodes(); err != nil {
 		log.Error(err)
 		return &pb.TAPIReply{Message: "TAPI error"}, nil
@@ -61,7 +61,7 @@ func (s *server) TAPIGetEdge(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIR
 }
 
 func (s *server) TAPIGetEdgeNode(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
-	log.Info("Received: %v", in.GetName())
+	log.Info("Received: ", in.GetName())
 	if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetNodeEdgePoints(); err != nil {
 		log.Error(err)
 		return &pb.TAPIReply{Message: "TAPI error"}, nil
@@ -70,7 +70,7 @@ func (s *server) TAPIGetEdgeNode(ctx context.Context, in *pb.TAPIRequest) (*pb.T
 }
 
 func (s *server) TAPIGetLink(ctx context.Context, in *pb.TAPIRequest) (*pb.TAPIReply, error) {
-	log.Info("Received: %v", in.GetName())
+	log.Info("Received: ", in.GetName())
 	if err := s.core.clients["ciena-mcp"].(*ciena.MCPClient).GetLinks(); err != nil {
 		log.Error(err)
 		return &pb.TAPIReply{Message: "TAPI error"}, nil

nucleus/controller.go

@@ -62,7 +62,7 @@ func (c *Core) AttachDatabase() {
 func (c *Core) Shutdown() {
 
 	stopIt := <- c.IsRunning
-	if(stopIt == false) {
+	if !stopIt {
 		log.Debug("Shutdown() received action to shutdown")
 	}else {
 		log.Debug("Shutdown() received something else.")