fix: log.Println log.Printf usage #743
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kongfei605
reviewed
Dec 22, 2023
inputs/greenplum/greenplum.go
Outdated
| @@ -48,7 +48,7 @@ func (ins *Greenplum) Gather(slist *types.SampleList) { | |||
| stateValue = strings.TrimSpace(stateValue) | |||
| gpstate := strings.Fields(stateValue) | |||
| if len(gpstate)%7 != 0 { | |||
| log.Println("E! failed to parse gpstate -m output: %v", gpstate) | |||
| log.Printf("E! failed to parse gpstate -m output: %v\n", gpstate) | |||
kongfei605
reviewed
Dec 22, 2023
| @@ -15,7 +15,7 @@ import ( | |||
| func TestGetExpvar(tb testing.TB, name string) expvar.Var { | |||
| tb.Helper() | |||
| v := expvar.Get(name) | |||
| log.Println("Var %q is %v", name, v) | |||
| log.Printf("Var %s is %v\n", name, v) | |||
kongfei605
reviewed
Dec 22, 2023
inputs/smart/instances.go
Outdated
| @@ -343,7 +344,7 @@ func gatherIntelNVMeDisk(slist *types.SampleList, timeout config.Duration, usesu | |||
|
|
|||
| _, er := exitStatus(e) | |||
| if er != nil { | |||
| log.Printf("E! failed to run command '%s %s': %w - %s", nvme, strings.Join(args, " "), e, outStr) | |||
| log.Printf("E! failed to run command '%s %s': %v - %s\n", nvme, strings.Join(args, " "), e, outStr) | |||
kongfei605
reviewed
Dec 22, 2023
inputs/smart/instances.go
Outdated
| @@ -412,7 +413,7 @@ func (m *Instance) gatherDisk(slist *types.SampleList, device string, wg *sync.W | |||
| // Ignore all exit statuses except if it is a command line parse error | |||
| exitStatus, er := exitStatus(e) | |||
| if er != nil { | |||
| log.Printf("E! failed to run command '%s %s': %w - %s", m.PathSmartctl, strings.Join(args, " "), e, outStr) | |||
| log.Printf("E! failed to run command '%s %s': %v - %s\n", m.PathSmartctl, strings.Join(args, " "), e, outStr) | |||
kongfei605
reviewed
Dec 22, 2023
logs/auditor/auditor.go
Outdated
| @@ -187,7 +187,7 @@ func (a *RegistryAuditor) recoverRegistry() map[string]*RegistryEntry { | |||
| mr, err := ioutil.ReadFile(a.registryPath) | |||
| if err != nil { | |||
| if os.IsNotExist(err) { | |||
| log.Println("I! Could not find state file at %q, will start with default offsets", a.registryPath) | |||
| log.Printf("I! Could not find state file at %q, will start with default offsets\n", a.registryPath) | |||
kongfei605
reviewed
Dec 22, 2023
| return false, retrier | ||
| } | ||
|
|
||
| // NewLauncher returns a new launcher. | ||
| func NewLauncher(sources *logsconfig.LogSources, services *service.Services, collectAll bool) *Launcher { | ||
| kubeutil, err := kubelet.GetKubeUtil() | ||
| if err != nil { | ||
| log.Printf("KubeUtil not available, failed to create launcher", err) | ||
| log.Println("KubeUtil not available, failed to create launcher: ", err) |
kongfei605
reviewed
Dec 22, 2023
logs/input/kubernetes/launcher.go
Outdated
| @@ -177,7 +177,7 @@ func (l *Launcher) addSource(svc *service.Service) { | |||
| if err != nil { | |||
| if errors.IsRetriable(err) { | |||
| // Attempt to reschedule the source later | |||
| log.Println("Failed to fetch pod info for container %v, will retry: %v", svc.Identifier, err) | |||
| log.Printf("Failed to fetch pod info for container %v, will retry: %v\n", svc.Identifier, err) | |||
kongfei605
reviewed
Dec 22, 2023
logs/input/kubernetes/launcher.go
Outdated
| @@ -192,7 +192,7 @@ func (l *Launcher) addSource(svc *service.Service) { | |||
| source, err := l.getSource(pod, container) | |||
| if err != nil { | |||
| if err != errCollectAllDisabled { | |||
| log.Println("Invalid configuration for pod %v, container %v: %v", pod.Metadata.Name, container.Name, err) | |||
| log.Printf("Invalid configuration for pod %v, container %v: %v\n", pod.Metadata.Name, container.Name, err) | |||
|
感谢 @katepangLiu 耐心细致的工作。 PR中有多处log.Printf 不需要加\n |
好的，我清理一下 |
katepangLiu
force-pushed
the
fix-Printf-Println
branch
from
0a8221f
to
b678b0c
Compare
|
Thank you @katepangLiu |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.