public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-21 12:39:33 +02:00
Code Issues Releases Wiki Activity

Improve logging

Browse Source
This commit is contained in:
Tomasz Sęk
2019-02-17 00:45:34 +01:00
parent 08b6dfb691
commit 1ad5992160
14 changed files with 154 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/manager/main.go
+19 -13
View File
@@ -9,6 +9,7 @@ import (
"github.com/jenkinsci/kubernetes-operator/pkg/apis"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants"
"github.com/jenkinsci/kubernetes-operator/pkg/event"
"github.com/jenkinsci/kubernetes-operator/pkg/log"
"github.com/jenkinsci/kubernetes-operator/version"
@@ -17,6 +18,7 @@ import (
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/ready"
sdkVersion "github.com/operator-framework/operator-sdk/version"
"github.com/pkg/errors"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -37,31 +39,31 @@ func main() {
debug := flag.Bool("debug", false, "Set log level to debug")
flag.Parse()
log.SetupLogger(debug)
log.SetupLogger(*debug)
printInfo()
namespace, err := k8sutil.GetWatchNamespace()
if err != nil {
fatal(err, "failed to get watch namespace")
fatal(errors.Wrap(err, "failed to get watch namespace"), *debug)
}
log.Log.Info(fmt.Sprintf("watch namespace: %v", namespace))
// get a config to talk to the apiserver
cfg, err := config.GetConfig()
if err != nil {
fatal(err, "failed to get config")
fatal(errors.Wrap(err, "failed to get config"), *debug)
}
// become the leader before proceeding
err = leader.Become(context.TODO(), "jenkins-operator-lock")
if err != nil {
fatal(err, "failed to become leader")
fatal(errors.Wrap(err, "failed to become leader"), *debug)
}
r := ready.NewFileReady()
err = r.Set()
if err != nil {
fatal(err, "failed to get ready.NewFileReady")
fatal(errors.Wrap(err, "failed to get ready.NewFileReady"), *debug)
}
defer func() {
_ = r.Unset()
@@ -70,36 +72,40 @@ func main() {
// create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{Namespace: namespace})
if err != nil {
fatal(err, "failed to create manager")
fatal(errors.Wrap(err, "failed to create manager"), *debug)
}
log.Log.Info("Registering Components.")
// setup Scheme for all resources
if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
fatal(err, "failed to setup scheme")
fatal(errors.Wrap(err, "failed to setup scheme"), *debug)
}
// setup events
events, err := event.New(cfg)
events, err := event.New(cfg, constants.OperatorName)
if err != nil {
fatal(err, "failed to create manager")
fatal(errors.Wrap(err, "failed to create manager"), *debug)
}
// setup Jenkins controller
if err := jenkins.Add(mgr, *local, *minikube, events); err != nil {
fatal(err, "failed to setup controllers")
fatal(errors.Wrap(err, "failed to setup controllers"), *debug)
}
log.Log.Info("Starting the Cmd.")
// start the Cmd
if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
fatal(err, "failed to start cmd")
fatal(errors.Wrap(err, "failed to start cmd"), *debug)
}
}
func fatal(err error, message string) {
log.Log.Error(err, message)
func fatal(err error, debug bool) {
if debug {
log.Log.Error(nil, fmt.Sprintf("%+v", err))
} else {
log.Log.Error(nil, fmt.Sprintf("%s", err))
}
os.Exit(-1)
}