Merge pull request #1840 from s0ders/refactor/host-info-error-msg

refactor: using fmt.Errorf in InfoWithContext
pull/1841/head
shirou 4 weeks ago committed by GitHub
commit f9f5620e1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -5,6 +5,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"os" "os"
"runtime" "runtime"
"time" "time"
@ -70,47 +71,47 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
ret.Hostname, err = os.Hostname() ret.Hostname, err = os.Hostname()
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting hostname: %w", err)
} }
ret.Platform, ret.PlatformFamily, ret.PlatformVersion, err = PlatformInformationWithContext(ctx) ret.Platform, ret.PlatformFamily, ret.PlatformVersion, err = PlatformInformationWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting platform information: %w", err)
} }
ret.KernelVersion, err = KernelVersionWithContext(ctx) ret.KernelVersion, err = KernelVersionWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting kernel version: %w", err)
} }
ret.KernelArch, err = KernelArch() ret.KernelArch, err = KernelArch()
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting kernel archictecture: %w", err)
} }
ret.VirtualizationSystem, ret.VirtualizationRole, err = VirtualizationWithContext(ctx) ret.VirtualizationSystem, ret.VirtualizationRole, err = VirtualizationWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting virtualization information: %w", err)
} }
ret.BootTime, err = BootTimeWithContext(ctx) ret.BootTime, err = BootTimeWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting boot time: %w", err)
} }
ret.Uptime, err = UptimeWithContext(ctx) ret.Uptime, err = UptimeWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting uptime: %w", err)
} }
ret.Procs, err = numProcs(ctx) ret.Procs, err = numProcs(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting number of procs: %w", err)
} }
ret.HostID, err = HostIDWithContext(ctx) ret.HostID, err = HostIDWithContext(ctx)
if err != nil && !errors.Is(err, common.ErrNotImplementedError) { if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
return nil, err return nil, fmt.Errorf("getting host ID: %w", err)
} }
return ret, nil return ret, nil

Loading…
Cancel
Save