Commit 5163603

bryfry <bryon@fryer.io>
2025-03-09 15:51:56
add POWEROFF_ON_IDLE env
main
1 parent b4c95ae
Changed files (6)
cmd
root.go
service.go
internal
aod
main.go
go.mod
go.sum
main.go
cmd/root.go
@@ -5,9 +5,10 @@ import "github.com/spf13/cobra"
 func Execute() error {
 
 	rootCmd := &cobra.Command{
-		Use:   "mm",
-		Short: "minecraft manager",
-		RunE:  service, // service.go
+		Use:          "mm",
+		Short:        "minecraft manager",
+		RunE:         service, // service.go
+		SilenceUsage: true,
 	}
 
 	rootCmd.AddCommand(InstallCmd())
cmd/service.go
@@ -1,8 +1,11 @@
 package cmd
 
 import (
+	"errors"
+	"fmt"
 	"log/slog"
 	"os"
+	"strconv"
 
 	"github.com/bryfry/mm/internal/aod"
 	"github.com/bryfry/mm/internal/cf"
@@ -10,6 +13,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	EnvDie = "MM_POWEROFF_ON_IDLE"
+)
+
+var (
+	_errFmt        = "required env variable %s not found or empty"
+	ErrDieRequired = errors.New(fmt.Sprintf(_errFmt, EnvDie))
+)
+
 func service(cmd *cobra.Command, args []string) error {
 
 	zoneName, zoneNameExists := os.LookupEnv(cf.EnvZoneName)
@@ -24,6 +36,14 @@ func service(cmd *cobra.Command, args []string) error {
 	if !apiTokenExists || len(apiToken) == 0 {
 		return cf.ErrAPITokenRequired
 	}
+	dieRaw, dieExists := os.LookupEnv(EnvDie)
+	if !dieExists || len(dieRaw) == 0 {
+		return ErrDieRequired
+	}
+	die, err := strconv.ParseBool(dieRaw)
+	if err != nil {
+		return fmt.Errorf("failed to parse %s bool=%q: %w", EnvDie, dieRaw, err)
+	}
 
 	ipDetails, err := iplookup.Discover()
 	if err != nil {
@@ -55,6 +75,5 @@ func service(cmd *cobra.Command, args []string) error {
 			slog.String("ip", cfdns.IP()))
 	}
 
-	// TODO: watch ENV
-	return aod.Watch(subdomainName)
+	return aod.Watch(subdomainName, die)
 }
internal/aod/main.go
@@ -8,8 +8,7 @@ import (
 	"github.com/bryfry/mm/internal/minecraft"
 )
 
-// TODO: options
-func Watch(domain string) error {
+func Watch(domain string, die bool) error {
 
 	const (
 		_targetPort      uint16        = 25565
@@ -23,7 +22,8 @@ func Watch(domain string) error {
 
 	slog.Info("active or die: starting",
 		slog.String("domain", domain),
-		slog.Int("port", int(_targetPort)))
+		slog.Int("port", int(_targetPort)),
+		slog.Bool("poweroff_on_timeout", die))
 
 	// loop variables and timers
 	lastActive := time.Now()
@@ -67,9 +67,13 @@ func Watch(domain string) error {
 			}
 
 			if inactiveDuration > _inactiveTimeout {
-				msg = "inactive timeout: powering off"
+				if die {
+					msg = "inactive timeout: powering off"
+					slog.LogAttrs(context.Background(), slog.LevelInfo, msg, details...)
+					return poweroff()
+				}
+				msg = "inactive timeout"
 				slog.LogAttrs(context.Background(), slog.LevelInfo, msg, details...)
-				return poweroff()
 			}
 		}
 	}
go.mod
@@ -3,6 +3,7 @@ module github.com/bryfry/mm
 go 1.23.5
 
 require (
+	github.com/cloudflare/cloudflare-go v0.114.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/godbus/dbus/v5 v5.1.0
 	github.com/spf13/cobra v1.8.1
@@ -10,7 +11,6 @@ require (
 )
 
 require (
-	github.com/cloudflare/cloudflare-go v0.114.0 // indirect
 	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -20,5 +20,4 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	zappem.net/pub/debug/xxd v1.0.0 // indirect
 )
go.sum
@@ -3,21 +3,29 @@ github.com/cloudflare/cloudflare-go v0.114.0/go.mod h1:O7fYfFfA6wKqKFn2QIR9lhj7F
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
 github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
 github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
@@ -25,8 +33,8 @@ github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZla
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
@@ -34,6 +42,5 @@ golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
 golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-zappem.net/pub/debug/xxd v1.0.0 h1:weitvkgR0yOBP4QfGTPyQDD25rxAJxYw6+Dy2wrA3Zs=
-zappem.net/pub/debug/xxd v1.0.0/go.mod h1:7m1I+mBsdwBWcaVp8P0w0YQP9UWRsJEkrXB4OwF6b/o=
main.go
@@ -1,7 +1,14 @@
 package main
 
-import "github.com/bryfry/mm/cmd"
+import (
+	"os"
+
+	"github.com/bryfry/mm/cmd"
+)
 
 func main() {
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		os.Exit(1)
+	}
 }