Skip to content

Commit c3a2037

Browse files
authored
using info as default log level (#395)
Signed-off-by: Wei Liu <liuweixa@redhat.com>
1 parent edc0ed9 commit c3a2037

12 files changed

+18
-22
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mqtt_client_cert ?= ""
6363
mqtt_client_key ?= ""
6464

6565
# Log verbosity level
66-
klog_v:=4
66+
klog_v:=2
6767

6868
# Location of the JSON web key set used to verify tokens:
6969
jwks_url:=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs

cmd/maestro/main.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,16 @@ func main() {
4444
// set the logging config file
4545
viper.SetConfigFile(logConfigFile)
4646
// default log level is info
47-
viper.SetDefault(varLogLevel, "info")
47+
logger.SetLogLevel("info")
4848
if err := viper.ReadInConfig(); err != nil {
49-
if _, ok := err.(*os.PathError); ok {
50-
log.Infof("no config file '%s'", logConfigFile)
51-
} else {
52-
log.Errorf("failed to read the config file '%s': %v", logConfigFile, err)
53-
}
49+
log.Warnf("failed to read the log config file '%s', using info as default log level, %v", logConfigFile, err)
5450
} else {
5551
logger.SetLogLevel(viper.GetString(varLogLevel))
5652
}
5753
// monitor the changes in the config file
5854
viper.WatchConfig()
5955
viper.OnConfigChange(func(e fsnotify.Event) {
60-
log.Infof("config file changed: %s, new log level: %s", e.Name, viper.GetString(varLogLevel))
56+
log.Infof("log config file changed: %s, new log level: %s", e.Name, viper.GetString(varLogLevel))
6157
logger.SetLogLevel(viper.GetString(varLogLevel))
6258
})
6359

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ require (
5959
k8s.io/component-base v0.33.4
6060
k8s.io/klog/v2 v2.130.1
6161
k8s.io/utils v0.0.0-20241210054802-24370beab758
62-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429
62+
open-cluster-management.io/api v1.1.0
6363
open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467
64-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2
64+
open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2
6565
sigs.k8s.io/yaml v1.6.0
6666
)
6767

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -957,12 +957,12 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
957957
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
958958
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
959959
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
960-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429 h1:jU4r3zijNA+Ab17oF7lBck0YHc7f7wM8r2RqZJw6ZSs=
961-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM=
960+
open-cluster-management.io/api v1.1.0 h1:fu5xst9T/Ya6o41kqdd0zbNiDU+D3nNMTvoRVeF8j+U=
961+
open-cluster-management.io/api v1.1.0/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM=
962962
open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467 h1:8ZnlbBeVqqRBQE6UR10O7ijGzRgBaOACbdI4ypUHAJ8=
963963
open-cluster-management.io/ocm v1.0.1-0.20251017020440-daa9b2fa5467/go.mod h1:GAanBImFCdlTjRqMcXu6i9ZyWamWerxaUIaumUL0PWk=
964-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2 h1:cQJuyf4p9VqqIbfpYkN8eRBrbyLpEc19WXeu8oyWpXA=
965-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2/go.mod h1:DH4EMNDMiousmaj+noHYQxm48T+dbogiAfALhDnrjMg=
964+
open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2 h1:W7mkuOGoBi4XRwqCHHk/icLqDwN0iD2cZ6twJ7q+skQ=
965+
open-cluster-management.io/sdk-go v1.0.1-0.20251020023450-e3c5205637d2/go.mod h1:kkw5jJp4y8Ofqpdp1Dj4GKudb5QApwnXriOvEsgn/wE=
966966
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
967967
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
968968
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=

templates/agent-template-aro-hcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ parameters:
4141
- name: KLOG_V
4242
displayName: KLOG V Level
4343
description: Log verbosity level
44-
value: "4"
44+
value: "2"
4545

4646
objects:
4747
- apiVersion: apiextensions.k8s.io/v1

templates/agent-template-rosa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ parameters:
4141
- name: KLOG_V
4242
displayName: KLOG V Level
4343
description: Log verbosity level
44-
value: "4"
44+
value: "2"
4545

4646
- name: MQTT_HOST
4747
description: Hostname for the mqtt broker.

templates/agent-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ parameters:
4141
- name: KLOG_V
4242
displayName: KLOG V Level
4343
description: Log verbosity level
44-
value: "4"
44+
value: "2"
4545

4646
- name: MESSAGE_DRIVER_TYPE
4747
displayName: Message Driver Type

templates/agent-tls-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ parameters:
4141
- name: KLOG_V
4242
displayName: KLOG V Level
4343
description: Log verbosity level
44-
value: "4"
44+
value: "2"
4545

4646
- name: MESSAGE_DRIVER_TYPE
4747
displayName: Message Driver Type

templates/service-template-aro-hcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parameters:
3838
- name: KLOG_V
3939
displayName: KLOG V Level
4040
description: Log verbosity level
41-
value: "4"
41+
value: "2"
4242

4343
- name: MEMORY_REQUEST
4444
description: Memory request for the API pods.

templates/service-template-rosa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ parameters:
3737
- name: KLOG_V
3838
displayName: KLOG V Level
3939
description: Log verbosity level
40-
value: "4"
40+
value: "2"
4141

4242
- name: MEMORY_REQUEST
4343
description: Memory request for the API pods.

0 commit comments

Comments
 (0)