container: remove global msg

This frees all container instances of side effects.

Signed-off-by: Ophestra <cat@gensokyo.uk>

4 files changed, 51 insertions, 45 deletions

diff --git a/internal/app/state/multi.go b/internal/app/state/multi.go
index 9a400ac6..822cddcd 100644
--- a/internal/app/state/multi.go
+++ b/internal/app/state/multi.go
@@ -13,8 +13,8 @@ import (
 	"sync"
 	"syscall"
 
+	"hakurei.app/container"
 	"hakurei.app/hst"
-	"hakurei.app/internal/hlog"
 )
 
 // fine-grained locking and access
@@ -24,16 +24,17 @@ type multiStore struct {
 	// initialised backends
 	backends *sync.Map
 
-	lock sync.RWMutex
+	msg container.Msg
+	mu  sync.RWMutex
 }
 
 func (s *multiStore) Do(identity int, f func(c Cursor)) (bool, error) {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
+	s.mu.RLock()
+	defer s.mu.RUnlock()
 
 	// load or initialise new backend
 	b := new(multiBackend)
-	b.lock.Lock()
+	b.mu.Lock()
 	if v, ok := s.backends.LoadOrStore(identity, b); ok {
 		b = v.(*multiBackend)
 	} else {
@@ -52,7 +53,7 @@ func (s *multiStore) Do(identity int, f func(c Cursor)) (bool, error) {
 		} else {
 			b.lockfile = l
 		}
-		b.lock.Unlock()
+		b.mu.Unlock()
 	}
 
 	// lock backend
@@ -85,17 +86,17 @@ func (s *multiStore) List() ([]int, error) {
 	for _, e := range entries {
 		// skip non-directories
 		if !e.IsDir() {
-			hlog.Verbosef("skipped non-directory entry %q", e.Name())
+			s.msg.Verbosef("skipped non-directory entry %q", e.Name())
 			continue
 		}
 
 		// skip non-numerical names
 		if v, err := strconv.Atoi(e.Name()); err != nil {
-			hlog.Verbosef("skipped non-aid entry %q", e.Name())
+			s.msg.Verbosef("skipped non-aid entry %q", e.Name())
 			continue
 		} else {
 			if v < 0 || v > 9999 {
-				hlog.Verbosef("skipped out of bounds entry %q", e.Name())
+				s.msg.Verbosef("skipped out of bounds entry %q", e.Name())
 				continue
 			}
 
@@ -107,8 +108,8 @@ func (s *multiStore) List() ([]int, error) {
 }
 
 func (s *multiStore) Close() error {
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.mu.Lock()
+	defer s.mu.Unlock()
 
 	var errs []error
 	s.backends.Range(func(_, value any) bool {
@@ -126,7 +127,7 @@ type multiBackend struct {
 	// created/opened by prepare
 	lockfile *os.File
 
-	lock sync.RWMutex
+	mu sync.RWMutex
 }
 
 func (b *multiBackend) filename(id *ID) string {
@@ -169,8 +170,8 @@ func (b *multiBackend) unlockFile() error {
 // reads all launchers in simpleBackend
 // file contents are ignored if decode is false
 func (b *multiBackend) load(decode bool) (Entries, error) {
-	b.lock.RLock()
-	defer b.lock.RUnlock()
+	b.mu.RLock()
+	defer b.mu.RUnlock()
 
 	// read directory contents, should only contain files named after ids
 	var entries []os.DirEntry
@@ -280,8 +281,8 @@ func (b *multiBackend) decodeState(r io.ReadSeeker, state *State) error {
 
 // Save writes process state to filesystem
 func (b *multiBackend) Save(state *State, configWriter io.WriterTo) error {
-	b.lock.Lock()
-	defer b.lock.Unlock()
+	b.mu.Lock()
+	defer b.mu.Unlock()
 
 	if configWriter == nil && state.Config == nil {
 		return ErrNoConfig
@@ -336,8 +337,8 @@ func (b *multiBackend) encodeState(w io.WriteSeeker, state *State, configWriter
 }
 
 func (b *multiBackend) Destroy(id ID) error {
-	b.lock.Lock()
-	defer b.lock.Unlock()
+	b.mu.Lock()
+	defer b.mu.Unlock()
 
 	return os.Remove(b.filename(&id))
 }
@@ -353,8 +354,8 @@ func (b *multiBackend) Len() (int, error) {
 }
 
 func (b *multiBackend) close() error {
-	b.lock.Lock()
-	defer b.lock.Unlock()
+	b.mu.Lock()
+	defer b.mu.Unlock()
 
 	err := b.lockfile.Close()
 	if err == nil || errors.Is(err, os.ErrInvalid) || errors.Is(err, os.ErrClosed) {
@@ -364,9 +365,10 @@ func (b *multiBackend) close() error {
 }
 
 // NewMulti returns an instance of the multi-file store.
-func NewMulti(runDir string) Store {
-	b := new(multiStore)
-	b.base = path.Join(runDir, "state")
-	b.backends = new(sync.Map)
-	return b
+func NewMulti(msg container.Msg, runDir string) Store {
+	return &multiStore{
+		msg:      msg,
+		base:     path.Join(runDir, "state"),
+		backends: new(sync.Map),
+	}
 }
diff --git a/internal/app/state/multi_test.go b/internal/app/state/multi_test.go
index d493a388..b8e1db9b 100644
--- a/internal/app/state/multi_test.go
+++ b/internal/app/state/multi_test.go
@@ -1,9 +1,13 @@
 package state_test
 
 import (
+	"log"
 	"testing"
 
+	"hakurei.app/container"
 	"hakurei.app/internal/app/state"
 )
 
-func TestMulti(t *testing.T) { testStore(t, state.NewMulti(t.TempDir())) }
+func TestMulti(t *testing.T) {
+	testStore(t, state.NewMulti(container.NewMsg(log.New(log.Writer(), "multi: ", 0)), t.TempDir()))
+}
diff --git a/internal/app/state/state.go b/internal/app/state/state.go
index 6a3a82db..59fbc8c7 100644
--- a/internal/app/state/state.go
+++ b/internal/app/state/state.go
@@ -19,9 +19,9 @@ type Store interface {
 	// Cursor provided to f becomes invalid as soon as f returns.
 	Do(identity int, f func(c Cursor)) (ok bool, err error)
 
-	// List queries the store and returns a list of aids known to the store.
-	// Note that some or all returned aids might not have any active apps.
-	List() (aids []int, err error)
+	// List queries the store and returns a list of identities known to the store.
+	// Note that some or all returned identities might not have any active apps.
+	List() (identities []int, err error)
 
 	// Close releases any resources held by Store.
 	Close() error
diff --git a/internal/app/state/state_test.go b/internal/app/state/state_test.go
index 0025918d..cc578652 100644
--- a/internal/app/state/state_test.go
+++ b/internal/app/state/state_test.go
@@ -16,10 +16,10 @@ import (
 
 func testStore(t *testing.T, s state.Store) {
 	t.Run("list empty store", func(t *testing.T) {
-		if aids, err := s.List(); err != nil {
+		if identities, err := s.List(); err != nil {
 			t.Fatalf("List: error = %v", err)
-		} else if len(aids) != 0 {
-			t.Fatalf("List: aids = %#v", aids)
+		} else if len(identities) != 0 {
+			t.Fatalf("List: identities = %#v", identities)
 		}
 	})
 
@@ -39,22 +39,22 @@ func testStore(t *testing.T, s state.Store) {
 		makeState(t, &tc[i].state, &tc[i].ct)
 	}
 
-	do := func(aid int, f func(c state.Cursor)) {
-		if ok, err := s.Do(aid, f); err != nil {
+	do := func(identity int, f func(c state.Cursor)) {
+		if ok, err := s.Do(identity, f); err != nil {
 			t.Fatalf("Do: ok = %v, error = %v", ok, err)
 		}
 	}
 
-	insert := func(i, aid int) {
-		do(aid, func(c state.Cursor) {
+	insert := func(i, identity int) {
+		do(identity, func(c state.Cursor) {
 			if err := c.Save(&tc[i].state, &tc[i].ct); err != nil {
 				t.Fatalf("Save(&tc[%v]): error = %v", i, err)
 			}
 		})
 	}
 
-	check := func(i, aid int) {
-		do(aid, func(c state.Cursor) {
+	check := func(i, identity int) {
+		do(identity, func(c state.Cursor) {
 			if entries, err := c.Load(); err != nil {
 				t.Fatalf("Load: error = %v", err)
 			} else if got, ok := entries[tc[i].state.ID]; !ok {
@@ -81,7 +81,7 @@ func testStore(t *testing.T, s state.Store) {
 		insert(insertEntryNoCheck, 0)
 	})
 
-	t.Run("insert entry different aid", func(t *testing.T) {
+	t.Run("insert entry different identity", func(t *testing.T) {
 		insert(insertEntryOtherApp, 1)
 		check(insertEntryOtherApp, 1)
 	})
@@ -90,14 +90,14 @@ func testStore(t *testing.T, s state.Store) {
 		check(insertEntryNoCheck, 0)
 	})
 
-	t.Run("list aids", func(t *testing.T) {
-		if aids, err := s.List(); err != nil {
+	t.Run("list identities", func(t *testing.T) {
+		if identities, err := s.List(); err != nil {
 			t.Fatalf("List: error = %v", err)
 		} else {
-			slices.Sort(aids)
+			slices.Sort(identities)
 			want := []int{0, 1}
-			if !slices.Equal(aids, want) {
-				t.Fatalf("List() = %#v, want %#v", aids, want)
+			if !slices.Equal(identities, want) {
+				t.Fatalf("List() = %#v, want %#v", identities, want)
 			}
 		}
 	})
@@ -110,7 +110,7 @@ func testStore(t *testing.T, s state.Store) {
 		}
 	})
 
-	t.Run("clear aid 1", func(t *testing.T) {
+	t.Run("clear identity 1", func(t *testing.T) {
 		do(1, func(c state.Cursor) {
 			if err := c.Destroy(tc[insertEntryOtherApp].state.ID); err != nil {
 				t.Fatalf("Destroy: error = %v", err)