Skip to content

Commit 032928b

Browse files
refact(manager): fix logs for manager errors (#180)
Signed-off-by: shubham <shubham.bajpai@mayadata.io>
1 parent 88f820e commit 032928b

File tree

1 file changed

+7
-26
lines changed

1 file changed

+7
-26
lines changed

cmd/manager/main.go

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ package main
1919
import (
2020
"flag"
2121
"fmt"
22-
"os"
2322
env "runtime"
24-
"strings"
2523
"time"
2624

2725
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -41,8 +39,7 @@ import (
4139
)
4240

4341
var (
44-
scheme = runtime.NewScheme()
45-
setupLog = ctrl.Log.WithName("setup")
42+
scheme = runtime.NewScheme()
4643
)
4744

4845
func init() {
@@ -81,46 +78,30 @@ func main() {
8178
SyncPeriod: &duration,
8279
})
8380
if err != nil {
84-
setupLog.Error(err, "unable to start manager")
85-
os.Exit(1)
81+
logrus.Fatal("failed to create manager:", err)
8682
}
8783

8884
if err = (&controllers.JivaVolumeReconciler{
8985
Client: mgr.GetClient(),
9086
Scheme: mgr.GetScheme(),
9187
Recorder: mgr.GetEventRecorderFor("jivavolume-controller"),
9288
}).SetupWithManager(mgr); err != nil {
93-
setupLog.Error(err, "unable to create controller", "controller", "JivaVolume")
94-
os.Exit(1)
89+
logrus.Fatal("failed to create controller JivaVolume:", err)
9590
}
9691
// +kubebuilder:scaffold:builder
9792
printVersion()
9893

9994
if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
100-
setupLog.Error(err, "unable to set up health check")
101-
os.Exit(1)
95+
logrus.Fatal("failed to set up health check:", err)
10296
}
10397

10498
if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
105-
setupLog.Error(err, "unable to set up ready check")
106-
os.Exit(1)
99+
logrus.Fatal("failed to set up ready check:", err)
107100
}
108101

109-
setupLog.Info("starting manager")
102+
logrus.Info("starting manager")
110103
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
111-
setupLog.Error(err, "problem running manager")
112-
os.Exit(1)
104+
logrus.Fatal("problem running manager:", err)
113105
}
114106

115107
}
116-
117-
// getOpenebsNamespace gets the namespace OPENEBS_NAMESPACE env value which is
118-
// set by the downward API where admission server has been deployed
119-
func getOpenebsNamespace() (string, error) {
120-
121-
ns, found := os.LookupEnv("OPENEBS_NAMESPACE")
122-
if !found {
123-
return "", fmt.Errorf("OPENEBS_NAMESPACE must be set")
124-
}
125-
return strings.TrimSpace(ns), nil
126-
}

0 commit comments

Comments
 (0)