libpod: Factor out jail name construction from stats_freebsd.go

[NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <[email protected]>
containers · Oct 18, 2022 · f8a7940 · f8a7940
1 parent e333066
commit f8a7940
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go
@@ -279,3 +279,11 @@ func (c *Container) getConmonPidFd() int {
 	// keeping things simple for now.
 	return -1
 }
+
+func (c *Container) jailName() string {
+	if c.state.NetNS != nil {
+		return c.state.NetNS.Name + "." + c.ID()
+	} else {
+		return c.ID()
+	}
+}
diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go
@@ -20,13 +20,9 @@ import (
 func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, previousStats *define.ContainerStats) error {
 	now := uint64(time.Now().UnixNano())
 
-	jailName := c.ID()
-	if c.state.NetNS != nil {
-		jailName = c.state.NetNS.Name + "." + jailName
-	}
-	entries, err := rctl.GetRacct("jail:" + jailName)
+	entries, err := rctl.GetRacct("jail:" + c.jailName())
 	if err != nil {
-		return fmt.Errorf("unable to read accounting for %s: %w", jailName, err)
+		return fmt.Errorf("unable to read accounting for %s: %w", c.jailName(), err)
 	}
 
 	// If the current total usage is less than what was previously