feat(pidproxy): read startsecs from env

chore: centralize env prefix

cmd/experiment/oneshot/oneshot.go

@@ -14,7 +14,6 @@ const (
 	// DummyPath = "/workspaces/wingmate/cmd/experiment/dummy/dummy"
 	DummyPath            = "/usr/local/bin/wmdummy"
 	EnvDummyPath         = "DUMMY_PATH"
-	EnvPrefix            = "WINGMATE"
 	EnvLog               = "LOG"
 	EnvLogMessage        = "LOG_MESSAGE"
 	EnvDefaultLogMessage = "oneshot executed"
@@ -23,7 +22,7 @@ const (
 )
 
 func main() {
-	viper.SetEnvPrefix(EnvPrefix)
+	viper.SetEnvPrefix(wingmate.EnvPrefix)
 	viper.BindEnv(EnvDummyPath)
 	viper.BindEnv(EnvLog)
 	viper.BindEnv(EnvLogMessage)

cmd/experiment/spawner/spawner.go

@@ -5,11 +5,11 @@ import (
 	"os/exec"
 	"time"
 
+	"gitea.suyono.dev/suyono/wingmate"
 	"github.com/spf13/viper"
 )
 
 const (
-	EnvPrefix      = "WINGMATE"
 	EnvOneShotPath = "ONESHOT_PATH"
 	OneShotPath    = "/usr/local/bin/wmoneshot"
 )
@@ -20,7 +20,7 @@ func main() {
 		err error
 		t   *time.Ticker
 	)
-	viper.SetEnvPrefix(EnvPrefix)
+	viper.SetEnvPrefix(wingmate.EnvPrefix)
 	viper.BindEnv(EnvOneShotPath)
 	viper.SetDefault(EnvOneShotPath, OneShotPath)
 

cmd/experiment/starter/starter.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"sync"
 
+	"gitea.suyono.dev/suyono/wingmate"
 	"github.com/spf13/viper"
 )
 
@@ -14,7 +15,6 @@ const (
 	// DummyPath = "/workspaces/wingmate/cmd/experiment/dummy/dummy"
 	DummyPath    = "/usr/local/bin/wmdummy"
 	EnvDummyPath = "DUMMY_PATH"
-	EnvPrefix    = "WINGMATE"
 )
 
 func main() {
@@ -25,7 +25,7 @@ func main() {
 		err     error
 		exePath string
 	)
-	viper.SetEnvPrefix(EnvPrefix)
+	viper.SetEnvPrefix(wingmate.EnvPrefix)
 	viper.BindEnv(EnvDummyPath)
 	viper.SetDefault(EnvDummyPath, DummyPath)
 

cmd/pidproxy/pidproxy.go

@@ -8,13 +8,16 @@ import (
 	"syscall"
 	"time"
 
+	"gitea.suyono.dev/suyono/wingmate"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"golang.org/x/sys/unix"
 )
 
 const (
-	pidFileFlag = "pid-file"
+	pidFileFlag         = "pid-file"
+	EnvStartSecs        = "STARTSECS"
+	EnvDefaultStartSecs = 1
 )
 
 var (
@@ -34,6 +37,10 @@ func main() {
 		found    bool
 	)
 
+	viper.SetEnvPrefix(wingmate.EnvPrefix)
+	viper.BindEnv(EnvStartSecs)
+	viper.SetDefault(EnvStartSecs, EnvDefaultStartSecs)
+
 	if len(os.Args) <= 2 {
 		log.Println("invalid argument")
 		os.Exit(1)
@@ -77,7 +84,8 @@ func pidProxy(cmd *cobra.Command, args []string) error {
 	} else {
 		go startProcess(childArgs[0])
 	}
-	time.Sleep(time.Second)
+	initialWait := viper.GetInt(EnvStartSecs)
+	time.Sleep(time.Second * time.Duration(initialWait))
 
 	var (
 		err error

docker/bookworm/Dockerfile

@@ -15,8 +15,8 @@ COPY --from=builder /root/wingmate/cmd/experiment/starter/starter /usr/local/bin
 COPY --from=builder /root/wingmate/cmd/experiment/oneshot/oneshot /usr/local/bin/wmoneshot
 COPY --from=builder /root/wingmate/cmd/experiment/spawner/spawner /usr/local/bin/wmspawner
 COPY --from=builder /root/wingmate/cmd/pidproxy/pidproxy /usr/local/bin/wmpidproxy
-ADD --chmod=755 docker/alpine/entry.sh /usr/local/bin/entry.sh
-ADD --chmod=755 docker/alpine/etc /etc
+ADD --chmod=755 docker/bookworm/entry.sh /usr/local/bin/entry.sh
+ADD --chmod=755 docker/bookworm/etc /etc
 
 ENTRYPOINT [ "/usr/local/bin/entry.sh" ]
 CMD [ "/usr/local/bin/wingmate" ]

types.go

@@ -6,4 +6,6 @@ const (
 	Any CronTimeType = iota
 	Exact
 	MultipleOccurrence
+
+	EnvPrefix = "WINGMATE"
 )