Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.21] main: still rely on logrus (rather than using the internal log) #4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 27, 2021
Merged

[release-1.21] main: still rely on logrus (rather than using the internal log) #4810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions cmd/crio/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@ func catchShutdown(ctx context.Context, cancel context.CancelFunc, gserver *grpc
case unix.SIGPIPE:
continue
case signals.Interrupt:
log.Debugf(ctx, "Caught SIGINT")
logrus.Debugf("Caught SIGINT")
case signals.Term:
log.Debugf(ctx, "Caught SIGTERM")
logrus.Debugf("Caught SIGTERM")
default:
continue
}
*signalled = true
gserver.GracefulStop()
hserver.Shutdown(ctx) // nolint: errcheck
if err := sserver.StopStreamServer(); err != nil {
log.Warnf(ctx, "error shutting down streaming server: %v", err)
logrus.Warnf("error shutting down streaming server: %v", err)
}
sserver.StopMonitors()
cancel()
if err := sserver.Shutdown(ctx); err != nil {
log.Warnf(ctx, "error shutting down main service %v", err)
logrus.Warnf("error shutting down main service %v", err)
}
return
}
Expand Down Expand Up @@ -185,9 +185,9 @@ func main() {
profilePort := c.Int("profile-port")
profileEndpoint := fmt.Sprintf("localhost:%v", profilePort)
go func() {
log.Debugf(ctx, "starting profiling server on %v", profileEndpoint)
logrus.Debugf("starting profiling server on %v", profileEndpoint)
if err := http.ListenAndServe(profileEndpoint, nil); err != nil {
log.Fatalf(ctx, "unable to run profiling server: %v", err)
logrus.Fatalf("unable to run profiling server: %v", err)
}
}()
}
Expand All @@ -211,7 +211,7 @@ func main() {

lis, err := server.Listen("unix", config.Listen)
if err != nil {
log.Fatalf(ctx, "failed to listen: %v", err)
logrus.Fatalf("failed to listen: %v", err)
}

grpcServer := grpc.NewServer(
Expand Down Expand Up @@ -254,13 +254,13 @@ func main() {
// CleanShutdownFile.
f, err := os.Create(config.CleanShutdownSupportedFileName())
if err != nil {
log.Errorf(ctx, "Writing clean shutdown supported file: %v", err)
logrus.Errorf("Writing clean shutdown supported file: %v", err)
}
f.Close()

// and sync the changes to disk
if err := utils.SyncParent(config.CleanShutdownFile); err != nil {
log.Errorf(ctx, "failed to sync parent directory of clean shutdown file: %v", err)
logrus.Errorf("failed to sync parent directory of clean shutdown file: %v", err)
}
}

Expand Down Expand Up @@ -300,12 +300,12 @@ func main() {

go func() {
if err := grpcServer.Serve(grpcL); err != nil {
log.Errorf(ctx, "unable to run GRPC server: %v", err)
logrus.Errorf("unable to run GRPC server: %v", err)
}
}()
go func() {
if err := httpServer.Serve(httpL); err != nil {
log.Debugf(ctx, "closed http server")
logrus.Debugf("closed http server")
}
}()

Expand All @@ -316,7 +316,7 @@ func main() {
if graceful && strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") {
err = nil
} else {
log.Errorf(ctx, "Failed to serve grpc request: %v", err)
logrus.Errorf("Failed to serve grpc request: %v", err)
}
}
}()
Expand All @@ -330,22 +330,22 @@ func main() {
}

if err := crioServer.Shutdown(ctx); err != nil {
log.Warnf(ctx, "error shutting down service: %v", err)
logrus.Warnf("error shutting down service: %v", err)
}
cancel()

<-streamServerCloseCh
log.Debugf(ctx, "closed stream server")
logrus.Debugf("closed stream server")
<-serverMonitorsCh
log.Debugf(ctx, "closed monitors")
logrus.Debugf("closed monitors")
err = <-hookSync
if err == nil || err == context.Canceled {
log.Debugf(ctx, "closed hook monitor")
logrus.Debugf("closed hook monitor")
} else {
log.Errorf(ctx, "hook monitor failed: %v", err)
logrus.Errorf("hook monitor failed: %v", err)
}
<-serverCloseCh
log.Debugf(ctx, "closed main server")
logrus.Debugf("closed main server")

return nil
}
Expand Down