diff --git a/database/database.go b/database/database.go index e761b779dc8400fca30ffba527eac536fa524a42..caefc09743776dcf6b5b3c07a5d062afa6f466f7 100644 --- a/database/database.go +++ b/database/database.go @@ -1,8 +1,7 @@ package database import ( - "log" - + "code.fbi.h-da.de/cocsn/gosdn/log" "github.com/neo4j/neo4j-go-driver/neo4j" ) @@ -74,7 +73,7 @@ func (d Database) StoreNodes(json string) { logError("failed storing Nodes into database", err) - log.Printf("successfully added Nodes into database") + log.Info("successfully added Nodes into database") } //StoreNodeEdgePoints stores the given node edge points (interfaces) @@ -101,7 +100,7 @@ func (d Database) StoreNodeEdgePoints(json string) { setNodeNodeEdgePointsRelation(session) - log.Printf("successfully added NodeEdgePoints into database") + log.Info("successfully added NodeEdgePoints into database") } @@ -121,12 +120,12 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) { logError("failed storing NodeNodeEdgePointsRelation into database", err) - log.Printf("successfully stored NodeNodeEdgePointsRelation into database") + log.Info("successfully stored NodeNodeEdgePointsRelation into database") } //logError logs error with custom and error message func logError(message string, err error) { if err != nil { - log.Fatalf("%v: %v", message, err) + log.Info("%v: %v", message, err) } } diff --git a/main.go b/main.go index 66836589d998071df74049e746168c5c39424027..b04ddc031a21f6fa6c8d2a0ed4b9d438643f8dcb 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "code.fbi.h-da.de/cocsn/gosdn/log" "code.fbi.h-da.de/cocsn/gosdn/nucleus" "flag" ) @@ -15,8 +16,10 @@ func main() { flag.Parse() cliSocket := *cliListenAddr + ":" + *cliListenPort + log.Loglevel(log.DEBUG) // hand off to cmd for further processing nucleus.StartUp(cliSocket, *configFileName) + log.Info("Startup completed") nucleus.Run() // nothing to see here, please move on! diff --git a/nucleus/controller.go b/nucleus/controller.go index 79d686aacb769ee5408aef7d17d0d55564c82fa3..2b4cdb19219dc74bf77a48d02f3363df09d2ead3 100644 --- a/nucleus/controller.go +++ b/nucleus/controller.go @@ -2,10 +2,10 @@ package nucleus import ( "code.fbi.h-da.de/cocsn/gosdn/database" + "code.fbi.h-da.de/cocsn/gosdn/log" "code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces" "code.fbi.h-da.de/cocsn/gosdn/restconf/client/ciena" "github.com/BurntSushi/toml" - "log" "os" ) diff --git a/nucleus/nucleus-core.go b/nucleus/nucleus-core.go index 5f586ef6185d7cfce46e95c3867a4086434dd8f5..5df7e06e4bc636360acab367cb2edfd82702e4ce 100644 --- a/nucleus/nucleus-core.go +++ b/nucleus/nucleus-core.go @@ -3,11 +3,11 @@ package nucleus import ( pb "code.fbi.h-da.de/cocsn/gosdn/cliInterface" "code.fbi.h-da.de/cocsn/gosdn/database" + "code.fbi.h-da.de/cocsn/gosdn/log" "code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces" "context" _ "github.com/mattn/go-sqlite3" "google.golang.org/grpc" - "log" "net" "time" ) @@ -20,31 +20,31 @@ type server struct { // SayHello implements helloworld.GreeterServer func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) { - log.Printf("Received: %v", in.GetName()) + log.Debug("Received: %v", in.GetName()) return &pb.HelloReply{Message: "Hello " + in.GetName()}, nil } func (s *server) Shutdown(ctx context.Context, in *pb.ShutdownRequest) (*pb.ShutdownReply, error) { - log.Printf("Received: %v", in.GetName()) + log.Debug("Received: %v", in.GetName()) isRunning = false return &pb.ShutdownReply{Message: "Shutdown " + in.GetName()}, nil } func getCLIGoing(core *Core) { - log.Println("Starting: GetCLIGoing") + log.Info("Starting: GetCLIGoing") // Boot-up the control interface for the cli cliControlListener, err := net.Listen("tcp", core.config.CliSocket) if err != nil { - log.Fatalf("failed to listen: %v", err) + log.Fatal("failed to listen: %v", err) } cliControlServer := grpc.NewServer() pb.RegisterGreeterServer(cliControlServer, &server{core: core}) if err := cliControlServer.Serve(cliControlListener); err != nil { - log.Fatalf("failed to serve: %v", err) + log.Fatal("failed to serve: %v", err) } - log.Println("Started: GetCLIGoing") + log.Info("Started: GetCLIGoing") } /* @@ -54,8 +54,8 @@ func getCLIGoing(core *Core) { // Next-up: backend database. func StartUp(socket, filename string) { - log.Println("This is the network superintendent...") - log.Println("Starting my ducks") + log.Info("This is the network superintendent...") + log.Info("Starting my ducks") // Init the Core core := Core{ clients: make(map[string]interfaces.Client, 0), @@ -64,7 +64,7 @@ func StartUp(socket, filename string) { core.Init(socket, filename) // Start the GRCP CLI go getCLIGoing(&core) - log.Println("and ready for take off") + log.Info("and ready for take off") } @@ -78,8 +78,8 @@ func Run() { for isRunning { time.Sleep(10 * time.Second) - log.Println("Still alive...") + log.Debug("Still alive...") } - log.Println("Good bye....!") + log.Info("Good bye....!") }