aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/app/lock.go3
-rw-r--r--cmd/hakurei/command.go6
-rw-r--r--cmd/hakurei/parse.go11
-rw-r--r--cmd/hakurei/parse_test.go2
-rw-r--r--cmd/hakurei/print.go13
-rw-r--r--cmd/hakurei/print_test.go2
6 files changed, 25 insertions, 12 deletions
diff --git a/cmd/app/lock.go b/cmd/app/lock.go
index 5a22efba..88068381 100644
--- a/cmd/app/lock.go
+++ b/cmd/app/lock.go
@@ -6,6 +6,7 @@ import (
"os"
"strconv"
"strings"
+ "syscall"
"hakurei.app/check"
"hakurei.app/fhs"
@@ -57,7 +58,7 @@ func informTemplate(base *check.Absolute, name string, mutable bool) (func() err
var s hst.State
for eh := range entries {
s = hst.State{}
- if _, err := eh.Load(&s); err != nil {
+ if _, err := eh.Load(&s, syscall.Kill); err != nil {
return nil, err
}
diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go
index 374d521c..76004d4f 100644
--- a/cmd/hakurei/command.go
+++ b/cmd/hakurei/command.go
@@ -351,7 +351,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
if !flagNoStore {
var sc hst.Paths
env.CopyPaths().Copy(&sc, new(outcome.Hsu).MustID(nil))
- entry = tryIdentifier(msg, name, outcome.NewStore(&sc))
+ entry = tryIdentifier(msg, syscall.Kill, name, outcome.NewStore(&sc))
}
if entry == nil {
@@ -380,7 +380,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
var sc hst.Paths
env.CopyPaths().Copy(&sc, new(outcome.Hsu).MustID(nil))
- entry := tryIdentifier(msg, args[0], outcome.NewStore(&sc))
+ entry := tryIdentifier(msg, syscall.Kill, args[0], outcome.NewStore(&sc))
if entry == nil {
log.Fatalf("%q does not match any active instance", args[0])
}
@@ -395,7 +395,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr
c.NewCommand("ps", "List active instances", func(args []string) error {
var sc hst.Paths
env.CopyPaths().Copy(&sc, new(outcome.Hsu).MustID(nil))
- printPs(msg, os.Stdout, time.Now().UTC(), outcome.NewStore(&sc), flagShort, flagJSON)
+ printPs(msg, syscall.Kill, os.Stdout, time.Now().UTC(), outcome.NewStore(&sc), flagShort, flagJSON)
return errSuccess
}).Flag(&flagShort, "short", command.BoolFlag(false), "Print instance id")
}
diff --git a/cmd/hakurei/parse.go b/cmd/hakurei/parse.go
index 31d0dfa6..09721fad 100644
--- a/cmd/hakurei/parse.go
+++ b/cmd/hakurei/parse.go
@@ -99,7 +99,12 @@ func shortIdentifierString(s string) string {
// tryIdentifier attempts to match [hst.State] from a [hex] representation of
// [hst.ID] or a prefix of its lower half.
-func tryIdentifier(msg message.Msg, name string, s *store.Store) *hst.State {
+func tryIdentifier(
+ msg message.Msg,
+ kill store.KillFunc,
+ name string,
+ s *store.Store,
+) *hst.State {
const (
likeShort = 1 << iota
likeFull
@@ -145,7 +150,7 @@ func tryIdentifier(msg message.Msg, name string, s *store.Store) *hst.State {
if strings.HasPrefix(eh.ID.String()[len(hst.ID{}):], name) {
var entry hst.State
- if _, err := eh.Load(&entry); err != nil {
+ if _, err := eh.Load(&entry, kill); err != nil {
msg.GetLogger().Println(getMessage("cannot load state entry:", err))
continue
}
@@ -168,7 +173,7 @@ func tryIdentifier(msg message.Msg, name string, s *store.Store) *hst.State {
if eh.ID == likelyID {
var entry hst.State
- if _, err := eh.Load(&entry); err != nil {
+ if _, err := eh.Load(&entry, kill); err != nil {
msg.GetLogger().Println(getMessage("cannot load state entry:", err))
continue
}
diff --git a/cmd/hakurei/parse_test.go b/cmd/hakurei/parse_test.go
index 1a574966..6f8a2299 100644
--- a/cmd/hakurei/parse_test.go
+++ b/cmd/hakurei/parse_test.go
@@ -108,7 +108,7 @@ func TestTryIdentifier(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
- got := tryIdentifier(msg, tc.s, store.New(base))
+ got := tryIdentifier(msg, nil, tc.s, store.New(base))
if !reflect.DeepEqual(got, tc.want) {
t.Errorf("tryIdentifier: %#v, want %#v", got, tc.want)
}
diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go
index 780dc55b..2ac626e7 100644
--- a/cmd/hakurei/print.go
+++ b/cmd/hakurei/print.go
@@ -170,7 +170,14 @@ func printShowInstance(
}
// printPs writes a representation of active instances to output.
-func printPs(msg message.Msg, output io.Writer, now time.Time, s *store.Store, short, flagJSON bool) {
+func printPs(
+ msg message.Msg,
+ kill store.KillFunc,
+ output io.Writer,
+ now time.Time,
+ s *store.Store,
+ short, flagJSON bool,
+) {
f := func(a func(eh *store.EntryHandle)) {
entries, copyError := s.All()
for eh := range entries {
@@ -184,7 +191,7 @@ func printPs(msg message.Msg, output io.Writer, now time.Time, s *store.Store, s
if short { // short output requires identifier only
var identifiers []*hst.ID
f(func(eh *store.EntryHandle) {
- if _, err := eh.Load(nil); err != nil { // passes through decode error
+ if _, err := eh.Load(nil, kill); err != nil { // passes through decode error
msg.GetLogger().Println(getMessage("cannot validate state entry header:", err))
return
}
@@ -206,7 +213,7 @@ func printPs(msg message.Msg, output io.Writer, now time.Time, s *store.Store, s
var instances []*hst.State
f(func(eh *store.EntryHandle) {
var state hst.State
- if _, err := eh.Load(&state); err != nil { // passes through decode error
+ if _, err := eh.Load(&state, kill); err != nil { // passes through decode error
msg.GetLogger().Println(getMessage("cannot load state entry:", err))
return
}
diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go
index a6e213c2..310fc885 100644
--- a/cmd/hakurei/print_test.go
+++ b/cmd/hakurei/print_test.go
@@ -770,7 +770,7 @@ func TestPrintPs(t *testing.T) {
var printBuf, logBuf bytes.Buffer
msg := message.New(log.New(&logBuf, "check: ", 0))
msg.SwapVerbose(true)
- printPs(msg, &printBuf, testTime, s, tc.short, tc.json)
+ printPs(msg, nil, &printBuf, testTime, s, tc.short, tc.json)
if got := printBuf.String(); got != tc.want {
t.Errorf("printPs:\n%s\nwant\n%s", got, tc.want)
return
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-30 22:55:38 +0000