Skip to content

Commit 82c3cf8

Browse files
committed
feat: listener is using a golang-commons logger now
1 parent 439d48e commit 82c3cf8

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

cmd/listener.go

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,26 @@ import (
2121
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2222
"sigs.k8s.io/controller-runtime/pkg/webhook"
2323

24+
"github.com/openmfp/golang-commons/logger"
2425
"github.com/openmfp/kubernetes-graphql-gateway/listener/discoveryclient"
2526
"github.com/openmfp/kubernetes-graphql-gateway/listener/kcp"
2627
)
2728

2829
var (
2930
scheme = runtime.NewScheme()
30-
setupLog = ctrl.Log.WithName("setup")
31+
setupLog *logger.Logger
3132
webhookServer webhook.Server
3233
metricsServerOptions metricsserver.Options
3334
)
3435

36+
func init() {
37+
var err error
38+
setupLog, err = setupLogger("info")
39+
if err != nil {
40+
panic("failed to initialize setup logger: " + err.Error())
41+
}
42+
}
43+
3544
var listenCmd = &cobra.Command{
3645
Use: "listener",
3746
Example: "KUBECONFIG=<path to kubeconfig file> go run . listener",
@@ -48,7 +57,7 @@ var listenCmd = &cobra.Command{
4857
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
4958

5059
disableHTTP2 := func(c *tls.Config) {
51-
setupLog.Info("disabling http/2")
60+
setupLog.Info().Msg("disabling http/2")
5261
c.NextProtos = []string{"http/1.1"}
5362
}
5463

@@ -76,7 +85,7 @@ var listenCmd = &cobra.Command{
7685
restCfg := ctrl.GetConfigOrDie()
7786
log, err := setupLogger(defaultCfg.Log.Level)
7887
if err != nil {
79-
setupLog.Error(err, "unable to setup logger")
88+
setupLog.Error().Err(err).Msg("unable to setup logger")
8089
os.Exit(1)
8190
}
8291

@@ -93,21 +102,21 @@ var listenCmd = &cobra.Command{
93102
Scheme: scheme,
94103
})
95104
if err != nil {
96-
setupLog.Error(err, "failed to create client from config")
105+
setupLog.Error().Err(err).Msg("failed to create client from config")
97106
os.Exit(1)
98107
}
99108

100109
mf := kcp.NewManagerFactory(log, appCfg)
101110

102111
mgr, err := mf.NewManager(ctx, restCfg, mgrOpts, clt)
103112
if err != nil {
104-
setupLog.Error(err, "unable to start manager")
113+
setupLog.Error().Err(err).Msg("unable to start manager")
105114
os.Exit(1)
106115
}
107116

108117
discoveryInterface, err := discovery.NewDiscoveryClientForConfig(restCfg)
109118
if err != nil {
110-
setupLog.Error(err, "failed to create discovery client")
119+
setupLog.Error().Err(err).Msg("failed to create discovery client")
111120
os.Exit(1)
112121
}
113122

@@ -118,30 +127,30 @@ var listenCmd = &cobra.Command{
118127
OpenAPIDefinitionsPath: appCfg.OpenApiDefinitionsPath,
119128
}
120129

121-
reconciler, err := kcp.NewReconciler(appCfg, reconcilerOpts, restCfg, discoveryInterface, kcp.PreReconcile, discoveryclient.NewFactory)
130+
reconciler, err := kcp.NewReconciler(appCfg, reconcilerOpts, restCfg, discoveryInterface, kcp.PreReconcile, discoveryclient.NewFactory, log)
122131

123132
if err != nil {
124-
setupLog.Error(err, "unable to instantiate reconciler")
133+
setupLog.Error().Err(err).Msg("unable to instantiate reconciler")
125134
os.Exit(1)
126135
}
127136

128137
if err := reconciler.SetupWithManager(mgr); err != nil {
129-
setupLog.Error(err, "unable to create controller")
138+
setupLog.Error().Err(err).Msg("unable to create controller")
130139
os.Exit(1)
131140
}
132141

133142
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
134-
setupLog.Error(err, "unable to set up health check")
143+
setupLog.Error().Err(err).Msg("unable to set up health check")
135144
os.Exit(1)
136145
}
137146
if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
138-
setupLog.Error(err, "unable to set up ready check")
147+
setupLog.Error().Err(err).Msg("unable to set up ready check")
139148
os.Exit(1)
140149
}
141150

142-
setupLog.Info("starting manager")
151+
setupLog.Info().Msg("starting manager")
143152
if err := mgr.Start(ctx); err != nil {
144-
setupLog.Error(err, "problem running manager")
153+
setupLog.Error().Err(err).Msg("problem running manager")
145154
os.Exit(1)
146155
}
147156
},

0 commit comments

Comments
 (0)