Skip to content

Commit

Permalink
Merge pull request #36 from SanyaKochhar/pr-comments-3
Browse files Browse the repository at this point in the history
chore: address PR follow-up comments
  • Loading branch information
SanyaKochhar authored Jun 15, 2021
2 parents 68730dc + f8be0cf commit 98533c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion deployment/aks-periscope.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ metadata:
name: collectors-config
namespace: aks-periscope
data:
COLLECTOR_LIST: managedCluster # <custom flag> connectedCluster OSM
COLLECTOR_LIST: managedCluster # <custom flag>
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
Expand Down
4 changes: 2 additions & 2 deletions pkg/utils/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func RunBackgroundCommand(command string, arg ...string) (int, error) {
cmd.Stderr = &stderr
err := cmd.Start()
if err != nil {
return 0, fmt.Errorf("Fail to start background command in container: %s", fmt.Sprint(err)+": "+stderr.String())
return 0, fmt.Errorf("Start background command in container exited with message %s: %w", stderr.String(), err)
}
return cmd.Process.Pid, nil
}
Expand All @@ -171,7 +171,7 @@ func RunBackgroundCommand(command string, arg ...string) (int, error) {
func KillProcess(pid int) error {
process, err := os.FindProcess(pid)
if err != nil {
return fmt.Errorf("Failed to find process with pid %d to kill: %+v", pid, fmt.Sprint(err))
return fmt.Errorf("Find process with pid %d to kill: %w", pid, err)
}
if err := process.Kill(); err != nil {
return err
Expand Down

0 comments on commit 98533c3

Please sign in to comment.