Skip to content

Commit f9f5620

Browse files
authored
Merge pull request #1840 from s0ders/refactor/host-info-error-msg
refactor: using fmt.Errorf in InfoWithContext
2 parents 7d9af6f + 0bbc484 commit f9f5620

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

host/host.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"context"
66
"encoding/json"
77
"errors"
8+
"fmt"
89
"os"
910
"runtime"
1011
"time"
@@ -70,47 +71,47 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
7071

7172
ret.Hostname, err = os.Hostname()
7273
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
73-
return nil, err
74+
return nil, fmt.Errorf("getting hostname: %w", err)
7475
}
7576

7677
ret.Platform, ret.PlatformFamily, ret.PlatformVersion, err = PlatformInformationWithContext(ctx)
7778
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
78-
return nil, err
79+
return nil, fmt.Errorf("getting platform information: %w", err)
7980
}
8081

8182
ret.KernelVersion, err = KernelVersionWithContext(ctx)
8283
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
83-
return nil, err
84+
return nil, fmt.Errorf("getting kernel version: %w", err)
8485
}
8586

8687
ret.KernelArch, err = KernelArch()
8788
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
88-
return nil, err
89+
return nil, fmt.Errorf("getting kernel archictecture: %w", err)
8990
}
9091

9192
ret.VirtualizationSystem, ret.VirtualizationRole, err = VirtualizationWithContext(ctx)
9293
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
93-
return nil, err
94+
return nil, fmt.Errorf("getting virtualization information: %w", err)
9495
}
9596

9697
ret.BootTime, err = BootTimeWithContext(ctx)
9798
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
98-
return nil, err
99+
return nil, fmt.Errorf("getting boot time: %w", err)
99100
}
100101

101102
ret.Uptime, err = UptimeWithContext(ctx)
102103
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
103-
return nil, err
104+
return nil, fmt.Errorf("getting uptime: %w", err)
104105
}
105106

106107
ret.Procs, err = numProcs(ctx)
107108
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
108-
return nil, err
109+
return nil, fmt.Errorf("getting number of procs: %w", err)
109110
}
110111

111112
ret.HostID, err = HostIDWithContext(ctx)
112113
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
113-
return nil, err
114+
return nil, fmt.Errorf("getting host ID: %w", err)
114115
}
115116

116117
return ret, nil

0 commit comments

Comments
 (0)