Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.

Commit 968a0ad

Browse files
author
jeremy
committed
DEV-40217: Support to set log levels and improve logs in argus related projects
1 parent f35228a commit 968a0ad

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

cmd/watch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func pollCollectorSetStatus(conn *grpc.ClientConn) (bool, error) {
113113
case <-timeout:
114114
return false, fmt.Errorf("Timeout waiting for collectors to become available")
115115
case <-ticker.C:
116-
log.Debugf("Start to check the collectors status")
116+
log.Debugf("Checking collectors status")
117117
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*500)
118118
defer cancel()
119119
req := &healthpb.HealthCheckRequest{
@@ -127,7 +127,7 @@ func pollCollectorSetStatus(conn *grpc.ClientConn) (bool, error) {
127127
if healthCheckResponse.GetStatus() == healthpb.HealthCheckResponse_SERVING {
128128
return true, nil
129129
}
130-
log.Debugf("The collectors is not ready: %d", healthCheckResponse.GetStatus())
130+
log.Debugf("The collectors are not ready: %d", healthCheckResponse.GetStatus())
131131
}
132132
}
133133
}

pkg/sync/initsyncer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (i *InitSyncer) InitSync() {
6767
// wait the init sync processes finishing
6868
wg.Wait()
6969
}
70-
log.Infof("Finish syncing the resource devices")
70+
log.Infof("Finished syncing the resource devices")
7171
}
7272

7373
func (i *InitSyncer) intSyncNodes(parentGroupID int32) {

pkg/watch/namespace/namespace.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (w Watcher) ObjType() runtime.Object {
3434
func (w Watcher) AddFunc() func(obj interface{}) {
3535
return func(obj interface{}) {
3636
namespace := obj.(*v1.Namespace)
37-
log.Debugf("Handle adding namespace event: %s", namespace.Name)
37+
log.Debugf("Handling add namespace event: %s", namespace.Name)
3838
for name, parentID := range w.DeviceGroups {
3939
var appliesTo devicegroup.AppliesToBuilder
4040
// Ensure that we are creating namespaces for namespaced resources.
@@ -71,7 +71,7 @@ func (w Watcher) AddFunc() func(obj interface{}) {
7171
// UpdateFunc is a function that implements the Watcher interface.
7272
func (w Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
7373
return func(oldObj, newObj interface{}) {
74-
log.Debugf("Ignore updating namespace event")
74+
log.Debugf("Ignoring update namespace event")
7575
// oldNamespace := oldObj.(*v1.Namespace)
7676
// newNamespace := newObj.(*v1.Namespace)
7777
}

pkg/watch/node/node.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (w *Watcher) AddFunc() func(obj interface{}) {
4343
return func(obj interface{}) {
4444
node := obj.(*v1.Node)
4545

46-
log.Debugf("Handle adding node event: %s", node.Name)
46+
log.Debugf("Handling add node event: %s", node.Name)
4747

4848
// Require an IP address.
4949
if getInternalAddress(node.Status.Addresses) == nil {
@@ -59,7 +59,7 @@ func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
5959
old := oldObj.(*v1.Node)
6060
new := newObj.(*v1.Node)
6161

62-
log.Debugf("Handle updating node event: %s", old.Name)
62+
log.Debugf("Handling update node event: %s", old.Name)
6363

6464
// If the old node does not have an IP, then there is no way we could
6565
// have added it to LogicMonitor. Therefore, it must be a new device.
@@ -83,7 +83,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
8383
return func(obj interface{}) {
8484
node := obj.(*v1.Node)
8585

86-
log.Debugf("Handle deleting node event: %s", node.Name)
86+
log.Debugf("Handling delete node event: %s", node.Name)
8787

8888
// Delete the node.
8989
if w.Config().DeleteDevices {

pkg/watch/pod/pod.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (w *Watcher) AddFunc() func(obj interface{}) {
3737
return func(obj interface{}) {
3838
pod := obj.(*v1.Pod)
3939

40-
log.Debugf("Handle adding pod event: %s", pod.Name)
40+
log.Debugf("Handling add pod event: %s", pod.Name)
4141

4242
// Require an IP address.
4343
if pod.Status.PodIP == "" {
@@ -53,7 +53,7 @@ func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
5353
old := oldObj.(*v1.Pod)
5454
new := newObj.(*v1.Pod)
5555

56-
log.Debugf("Handle updating pod event: %s", old.Name)
56+
log.Debugf("Handling update pod event: %s", old.Name)
5757

5858
// If the old pod does not have an IP, then there is no way we could
5959
// have added it to LogicMonitor. Therefore, it must be a new w.
@@ -83,7 +83,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
8383
return func(obj interface{}) {
8484
pod := obj.(*v1.Pod)
8585

86-
log.Debugf("Handle deleting pod event: %s", pod.Name)
86+
log.Debugf("Handling delete pod event: %s", pod.Name)
8787

8888
// Delete the pod.
8989
if w.Config().DeleteDevices {

0 commit comments

Comments
 (0)