wip: ready for initial test

.devcontainer/devcontainer.json

@@ -1,25 +1,10 @@
 {
   "name": "Golang Dev",
   "image": "golang-dev:1.21-bookworm-user",
-  "mounts": [
-    {
-      "source": "WingmateGoPath",
-      "target": "/go",
-      "type": "volume"
-    },
-    {
-      "source": "WingmateGolangDevHome",
-      "target": "/home/golang",
-      "type": "volume"
-    }
-  ],
   "customizations": {
     "vscode": {
       "extensions": [
-        "golang.go",
-        "ms-azuretools.vscode-docker",
-        "ms-vscode.makefile-tools",
-        "ms-vscode.cpptools-extension-pack"
+        "golang.go"
       ]
     }
   }

.gitignore

@@ -1,3 +1,2 @@
-/cmd/wingmate/wingmate
-/cmd/pidproxy/pidproxy
-/cmd/exec/exec
+/.idea
+/wingmate

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wingmate.iml" filepath="$PROJECT_DIR$/.idea/wingmate.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/wingmate.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.tool-versions

@@ -1 +1 @@
-golang 1.21.5
+golang 1.21.4

Makefile

@@ -1,43 +0,0 @@
-DESTDIR = /usr/local/bin
-
-all: wingmate dummy oneshot spawner starter pidproxy exec
-
-wingmate:
-	$(MAKE) -C cmd/wingmate all
-
-pidproxy:
-	$(MAKE) -C cmd/pidproxy all
-
-exec:
-	$(MAKE) -C cmd/exec all
-
-dummy:
-	$(MAKE) -C cmd/experiment/dummy all
-
-oneshot:
-	$(MAKE) -C cmd/experiment/oneshot all
-
-spawner:
-	$(MAKE) -C cmd/experiment/spawner all
-
-starter:
-	$(MAKE) -C cmd/experiment/starter all
-
-clean:
-	$(MAKE) -C cmd/wingmate clean
-	$(MAKE) -C cmd/pidproxy clean
-	$(MAKE) -C cmd/exec clean
-	$(MAKE) -C cmd/experiment/dummy clean
-	$(MAKE) -C cmd/experiment/oneshot clean
-	$(MAKE) -C cmd/experiment/spawner clean
-	$(MAKE) -C cmd/experiment/starter clean
-
-install:
-	install -d ${DESTDIR}
-	$(MAKE) -C cmd/wingmate DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/pidproxy DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/exec DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/experiment/dummy DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/experiment/oneshot DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/experiment/spawner DESTDIR=${DESTDIR} install
-	$(MAKE) -C cmd/experiment/starter DESTDIR=${DESTDIR} install

cmd/exec/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install exec ${DESTDIR}/wmexec

cmd/exec/ent.go

@@ -1,11 +0,0 @@
-//go:build !(cgo && linux)
-
-package main
-
-func getUid(user string) (uint64, error) {
-	panic("not implemented")
-}
-
-func getGid(group string) (uint64, error) {
-	panic("not implemented")
-}

cmd/exec/ent_lin.go

@@ -1,51 +0,0 @@
-//go:build cgo && linux
-
-package main
-
-/*
-#include<errno.h>
-#include<string.h>
-#include<sys/types.h>
-#include<pwd.h>
-#include<grp.h>
-
-static uid_t getuid(const char* username) {
-	struct passwd local, *rv;
-	errno = 0;
-	rv = getpwnam(username);
-	if (errno != 0) {
-		return 0;
-	}
-
-	memcpy(&local, rv, sizeof(struct passwd));
-	return local.pw_uid;
-}
-static gid_t getgid(const char* groupname) {
-	struct group local, *rv;
-	errno = 0;
-	rv = getgrnam(groupname);
-	if (errno != 0) {
-		return 0;
-	}
-
-	memcpy(&local, rv, sizeof(struct group));
-	return local.gr_gid;
-}
-*/
-import "C"
-
-func getUid(user string) (uint64, error) {
-	u, err := C.getuid(C.CString(user))
-	if err != nil {
-		return 0, err
-	}
-	return uint64(u), nil
-}
-
-func getGid(group string) (uint64, error) {
-	g, err := C.getgid(C.CString(group))
-	if err != nil {
-		return 0, err
-	}
-	return uint64(g), nil
-}

cmd/exec/exec.go

@@ -1,133 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"golang.org/x/sys/unix"
-)
-
-const (
-	setsidFlag = "setsid"
-	EnvSetsid  = "SETSID"
-	userFlag   = "user"
-	EnvUser    = "USER"
-)
-
-var (
-	rootCmd = &cobra.Command{
-		Use:  "wmexec",
-		RunE: execCmd,
-	}
-
-	childArgs []string
-)
-
-func main() {
-	var (
-		found    bool
-		i        int
-		arg      string
-		selfArgs []string
-	)
-
-	rootCmd.PersistentFlags().BoolP(setsidFlag, "s", false, "set to true to run setsid() before exec")
-	viper.BindPFlag(EnvSetsid, rootCmd.PersistentFlags().Lookup(setsidFlag))
-
-	rootCmd.PersistentFlags().StringP(userFlag, "u", "", "\"user:[group]\"")
-	viper.BindPFlag(EnvUser, rootCmd.PersistentFlags().Lookup(userFlag))
-
-	viper.SetEnvPrefix(wingmate.EnvPrefix)
-	viper.BindEnv(EnvUser)
-	viper.BindEnv(EnvSetsid)
-	viper.SetDefault(EnvSetsid, false)
-	viper.SetDefault(EnvUser, "")
-
-	found = false
-	for i, arg = range os.Args {
-		if arg == "--" {
-			found = true
-			if len(os.Args) <= i+1 {
-				log.Println("invalid argument")
-				os.Exit(1)
-			}
-			selfArgs = os.Args[1:i]
-			childArgs = os.Args[i+1:]
-			break
-		}
-	}
-	if !found {
-		log.Println("invalid argument")
-		os.Exit(1)
-	}
-
-	if len(childArgs) == 0 {
-		log.Println("invalid argument")
-		os.Exit(1)
-	}
-
-	rootCmd.SetArgs(selfArgs)
-	if err := rootCmd.Execute(); err != nil {
-		log.Println(err)
-		os.Exit(1)
-	}
-}
-
-func execCmd(cmd *cobra.Command, args []string) error {
-	if viper.GetBool(EnvSetsid) {
-		_, _ = unix.Setsid()
-	}
-
-	var (
-		uid  uint64
-		gid  uint64
-		err  error
-		path string
-	)
-
-	ug := viper.GetString(EnvUser)
-	if len(ug) > 0 {
-		user, group, ok := strings.Cut(ug, ":")
-		if ok {
-			if gid, err = strconv.ParseUint(group, 10, 32); err != nil {
-				if gid, err = getGid(group); err != nil {
-					return fmt.Errorf("cgo getgid: %w", err)
-				}
-			}
-			if err = unix.Setgid(int(gid)); err != nil {
-				return fmt.Errorf("setgid: %w", err)
-			}
-		}
-
-		uid, err = strconv.ParseUint(user, 10, 32)
-		if err != nil {
-			if uid, err = getUid(user); err != nil {
-				return fmt.Errorf("cgo getuid: %w", err)
-			}
-		}
-		if err = unix.Setuid(int(uid)); err != nil {
-			return fmt.Errorf("setuid: %w", err)
-		}
-
-	}
-
-	if path, err = exec.LookPath(childArgs[0]); err != nil {
-		if !errors.Is(err, exec.ErrDot) {
-			return fmt.Errorf("lookpath: %w", err)
-		}
-	}
-
-	if err = unix.Exec(path, childArgs, os.Environ()); err != nil {
-		return fmt.Errorf("exec: %w", err)
-	}
-
-	return nil
-}

cmd/experiment/.gitignore

@@ -1,4 +0,0 @@
-/dummy/dummy
-/starter/starter
-/oneshot/oneshot
-/spawner/spawner

cmd/experiment/dummy/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install dummy ${DESTDIR}/wmdummy

cmd/experiment/dummy/dummy.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"time"
-)
-
-func main() {
-	log.Println("using log.Println")
-	fmt.Println("using fmt.Println")
-
-	time.Sleep(time.Second * 5)
-
-	log.Println("log: finishing up")
-	fmt.Println("fmt: finishing up")
-}

cmd/experiment/oneshot/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install oneshot ${DESTDIR}/wmoneshot

cmd/experiment/oneshot/oneshot.go

@@ -1,78 +0,0 @@
-package main
-
-import (
-	"log"
-	"math/rand"
-	"os"
-	"os/exec"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/viper"
-)
-
-const (
-	// DummyPath = "/workspaces/wingmate/cmd/experiment/dummy/dummy"
-	DummyPath            = "/usr/local/bin/wmdummy"
-	EnvDummyPath         = "DUMMY_PATH"
-	EnvLog               = "LOG"
-	EnvLogMessage        = "LOG_MESSAGE"
-	EnvDefaultLogMessage = "oneshot executed"
-	EnvInstanceNum       = "INSTANCE_NUM"
-	EnvDefaultInstances  = -1
-)
-
-func main() {
-	viper.SetEnvPrefix(wingmate.EnvPrefix)
-	viper.BindEnv(EnvDummyPath)
-	viper.BindEnv(EnvLog)
-	viper.BindEnv(EnvLogMessage)
-	viper.BindEnv(EnvInstanceNum)
-	viper.SetDefault(EnvDummyPath, DummyPath)
-	viper.SetDefault(EnvLogMessage, EnvDefaultLogMessage)
-	viper.SetDefault(EnvInstanceNum, EnvDefaultInstances)
-
-	exePath := viper.GetString(EnvDummyPath)
-
-	logPath := viper.GetString(EnvLog)
-	logMessage := viper.GetString(EnvLogMessage)
-	log.Println("log path:", logPath)
-	if logPath != "" {
-		var (
-			err  error
-			file *os.File
-		)
-
-		if file, err = os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o666); err == nil {
-			defer func() {
-				_ = file.Close()
-			}()
-
-			if err = wingmate.NewLog(file); err == nil {
-				wingmate.Log().Info().Msg(logMessage)
-			}
-		}
-	}
-
-	StartInstances(exePath)
-}
-
-func StartInstances(exePath string) {
-	num := (rand.Uint32() % 16) + 16
-
-	iNum := viper.GetInt(EnvInstanceNum)
-	if iNum > 0 {
-		num = uint32(iNum)
-	}
-
-	var (
-		ctr uint32
-		cmd *exec.Cmd
-		err error
-	)
-	for ctr = 0; ctr < num; ctr++ {
-		cmd = exec.Command(exePath)
-		if err = cmd.Start(); err != nil {
-			log.Printf("failed to run %s: %+v\n", exePath, err)
-		}
-	}
-}

cmd/experiment/spawner/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install spawner ${DESTDIR}/wmspawner

cmd/experiment/spawner/spawner.go

@@ -1,40 +0,0 @@
-package main
-
-import (
-	"log"
-	"os/exec"
-	"time"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/viper"
-)
-
-const (
-	EnvOneShotPath = "ONESHOT_PATH"
-	OneShotPath    = "/usr/local/bin/wmoneshot"
-)
-
-func main() {
-	var (
-		cmd *exec.Cmd
-		err error
-		t   *time.Ticker
-	)
-	viper.SetEnvPrefix(wingmate.EnvPrefix)
-	viper.BindEnv(EnvOneShotPath)
-	viper.SetDefault(EnvOneShotPath, OneShotPath)
-
-	exePath := viper.GetString(EnvOneShotPath)
-
-	t = time.NewTicker(time.Second * 5)
-	for {
-		cmd = exec.Command(exePath)
-		if err = cmd.Run(); err != nil {
-			log.Printf("failed to run %s: %+v\n", exePath, err)
-		} else {
-			log.Printf("%s executed\n", exePath)
-		}
-
-		<-t.C
-	}
-}

cmd/experiment/starter/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install starter ${DESTDIR}/wmstarter

cmd/experiment/starter/starter.go

@@ -1,73 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"io"
-	"log"
-	"os/exec"
-	"sync"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/viper"
-)
-
-const (
-	// DummyPath = "/workspaces/wingmate/cmd/experiment/dummy/dummy"
-	DummyPath    = "/usr/local/bin/wmdummy"
-	EnvDummyPath = "DUMMY_PATH"
-)
-
-func main() {
-	var (
-		stdout  io.ReadCloser
-		stderr  io.ReadCloser
-		wg      *sync.WaitGroup
-		err     error
-		exePath string
-	)
-	viper.SetEnvPrefix(wingmate.EnvPrefix)
-	viper.BindEnv(EnvDummyPath)
-	viper.SetDefault(EnvDummyPath, DummyPath)
-
-	exePath = viper.GetString(EnvDummyPath)
-
-	cmd := exec.Command(exePath)
-
-	if stdout, err = cmd.StdoutPipe(); err != nil {
-		log.Panic(err)
-	}
-
-	if stderr, err = cmd.StderrPipe(); err != nil {
-		log.Panic(err)
-	}
-
-	wg = &sync.WaitGroup{}
-	wg.Add(2)
-	go pulley(wg, stdout, "stdout")
-	go pulley(wg, stderr, "stderr")
-
-	if err = cmd.Start(); err != nil {
-		log.Panic(err)
-	}
-	wg.Wait()
-
-	if err = cmd.Wait(); err != nil {
-		log.Printf("got error when Waiting for child process: %#v\n", err)
-	}
-}
-
-func pulley(wg *sync.WaitGroup, src io.ReadCloser, srcName string) {
-	defer wg.Done()
-
-	scanner := bufio.NewScanner(src)
-	for scanner.Scan() {
-		log.Printf("coming out from %s: %s\n", srcName, scanner.Text())
-	}
-
-	if err := scanner.Err(); err != nil {
-		log.Printf("got error whean reading from %s: %#v\n", srcName, err)
-	}
-
-	log.Printf("closing %s...\n", srcName)
-	_ = src.Close()
-}

cmd/pidproxy/Makefile

@@ -1,8 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install pidproxy ${DESTDIR}/wmpidproxy

cmd/pidproxy/pidproxy.go

@@ -1,164 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-	"os/exec"
-	"os/signal"
-	"strconv"
-	"syscall"
-	"time"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"golang.org/x/sys/unix"
-)
-
-const (
-	pidFileFlag         = "pid-file"
-	EnvStartSecs        = "STARTSECS"
-	EnvDefaultStartSecs = 1
-)
-
-var (
-	rootCmd = &cobra.Command{
-		Use:  "wmpidproxy",
-		RunE: pidProxy,
-	}
-
-	childArgs []string
-)
-
-func main() {
-	var (
-		i        int
-		arg      string
-		selfArgs []string
-		found    bool
-	)
-
-	viper.SetEnvPrefix(wingmate.EnvPrefix)
-	viper.BindEnv(EnvStartSecs)
-	viper.SetDefault(EnvStartSecs, EnvDefaultStartSecs)
-
-	rootCmd.PersistentFlags().StringP(pidFileFlag, "p", "", "location of pid file")
-	rootCmd.MarkFlagRequired(pidFileFlag)
-	viper.BindPFlag(pidFileFlag, rootCmd.PersistentFlags().Lookup(pidFileFlag))
-
-	found = false
-	for i, arg = range os.Args {
-		if arg == "--" {
-			found = true
-			if len(os.Args) <= i+1 {
-				log.Println("invalid argument")
-				os.Exit(1)
-			}
-			selfArgs = os.Args[1:i]
-			childArgs = os.Args[i+1:]
-			break
-		}
-	}
-	if !found {
-		log.Println("invalid argument")
-		os.Exit(1)
-	}
-
-	if len(childArgs) == 0 {
-		log.Println("invalid argument")
-		os.Exit(1)
-	}
-
-	rootCmd.SetArgs(selfArgs)
-
-	if err := rootCmd.Execute(); err != nil {
-		log.Println(err)
-		os.Exit(1)
-	}
-}
-
-func pidProxy(cmd *cobra.Command, args []string) error {
-	pidfile := viper.GetString(pidFileFlag)
-	log.Printf("%s %v", pidfile, childArgs)
-	if len(childArgs) > 1 {
-		go startProcess(childArgs[0], childArgs[1:]...)
-	} else {
-		go startProcess(childArgs[0])
-	}
-	initialWait := viper.GetInt(EnvStartSecs)
-	time.Sleep(time.Second * time.Duration(initialWait))
-
-	var (
-		err error
-		pid int
-		sc  chan os.Signal
-		t   *time.Timer
-	)
-
-	sc = make(chan os.Signal, 1)
-	signal.Notify(sc, unix.SIGTERM)
-
-	t = time.NewTimer(time.Second)
-
-check:
-	for {
-		if pid, err = readPid(pidfile); err != nil {
-			return err
-		}
-
-		if err = unix.Kill(pid, syscall.Signal(0)); err != nil {
-			return err
-		}
-
-		select {
-		case <-t.C:
-		case <-sc:
-			if pid, err = readPid(pidfile); err != nil {
-				return err
-			}
-
-			if err = unix.Kill(pid, unix.SIGTERM); err != nil {
-				return err
-			}
-			break check
-		}
-	}
-	return nil
-}
-
-func readPid(pidFile string) (int, error) {
-	var (
-		file  *os.File
-		err   error
-		buf   []byte
-		n     int
-		pid64 int64
-	)
-
-	if file, err = os.Open(pidFile); err != nil {
-		return 0, err
-	}
-	defer func() {
-		_ = file.Close()
-	}()
-
-	buf = make([]byte, 1024)
-	n, err = file.Read(buf)
-	if err != nil {
-		return 0, err
-	}
-
-	pid64, err = strconv.ParseInt(string(buf[:n]), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return int(pid64), nil
-}
-
-func startProcess(arg0 string, args ...string) {
-	if err := exec.Command(arg0, args...).Run(); err != nil {
-		log.Println("exec:", err)
-		return
-	}
-}

cmd/wingmate/Makefile

@@ -1,9 +0,0 @@
-all:
-	go build -v
-
-clean:
-	go clean -i -cache -testcache
-
-install:
-	install wingmate ${DESTDIR}/wingmate
-	

config/config.go

@@ -7,7 +7,6 @@ import (
 
 	"gitea.suyono.dev/suyono/wingmate"
 	"github.com/spf13/viper"
-	"golang.org/x/sys/unix"
 )
 
 const (
@@ -49,16 +48,13 @@ func Read() (*Config, error) {
 	if len(dirent) > 0 {
 		for _, d := range dirent {
 			if d.Type().IsRegular() {
-				svcPath := filepath.Join(svcdir, d.Name())
-				if err = unix.Access(svcPath, unix.X_OK); err == nil {
 				serviceAvailable = true
-					outConfig.ServicePaths = append(outConfig.ServicePaths, svcPath)
-				}
+				outConfig.ServicePaths = append(outConfig.ServicePaths, filepath.Join(svcdir, d.Name()))
 			}
 		}
 	}
 	if err != nil {
-		wingmate.Log().Error().Msgf("encounter error when reading service directory %s: %+v", svcdir, err)
+		wingmate.Log().Error().Msgf("encounter error when reading service directory %s: %#v", svcdir, err)
 	}
 
 	crontabfile = filepath.Join(configPath, CrontabFileName)
@@ -68,7 +64,7 @@ func Read() (*Config, error) {
 		cronAvailable = true
 	}
 	if err != nil {
-		wingmate.Log().Error().Msgf("encounter error when reading crontab %s: %+v", crontabfile, err)
+		wingmate.Log().Error().Msgf("encounter error when reading crontab %s: %#v", crontabfile, err)
 	}
 
 	if !serviceAvailable && !cronAvailable {

config/config_test.go

@@ -1,130 +0,0 @@
-package config
-
-import (
-	"os"
-	"path"
-	"testing"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRead(t *testing.T) {
-
-	type testEntry struct {
-		name     string
-		testFunc func(t *testing.T)
-	}
-
-	var (
-		configDir string
-		err       error
-	)
-
-	const serviceDir = "service"
-
-	setup := func(t *testing.T) {
-		if configDir, err = os.MkdirTemp("", "wingmate-*-test"); err != nil {
-			t.Fatal("setup", err)
-		}
-		viper.Set(EnvConfigPath, configDir)
-	}
-
-	tear := func(t *testing.T) {
-		if err = os.RemoveAll(configDir); err != nil {
-			t.Fatal("tear", err)
-		}
-	}
-
-	mkSvcDir := func(t *testing.T) {
-		if err := os.MkdirAll(path.Join(configDir, serviceDir), 0755); err != nil {
-			t.Fatal("create dir", err)
-		}
-	}
-
-	touchFile := func(t *testing.T, name string, perm os.FileMode) {
-		f, err := os.OpenFile(name, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, perm)
-		if err != nil {
-			t.Fatal("create file", err)
-		}
-		_ = f.Close()
-	}
-
-	_ = wingmate.NewLog(os.Stderr)
-	tests := []testEntry{
-		{
-			name: "positive",
-			testFunc: func(t *testing.T) {
-				mkSvcDir(t)
-				touchFile(t, path.Join(configDir, serviceDir, "one.sh"), 0755)
-				touchFile(t, path.Join(configDir, serviceDir, "two.sh"), 0755)
-
-				cfg, err := Read()
-				assert.Nil(t, err)
-				assert.ElementsMatch(
-					t,
-					cfg.ServicePaths,
-					[]string{
-						path.Join(configDir, serviceDir, "one.sh"),
-						path.Join(configDir, serviceDir, "two.sh"),
-					},
-				)
-			},
-		},
-		{
-			name: "with directory",
-			testFunc: func(t *testing.T) {
-				const subdir1 = "subdir1"
-				mkSvcDir(t)
-				assert.Nil(t, os.Mkdir(path.Join(configDir, serviceDir, subdir1), 0755))
-				touchFile(t, path.Join(configDir, serviceDir, subdir1, "one.sh"), 0755)
-				touchFile(t, path.Join(configDir, serviceDir, "two.sh"), 0755)
-				cfg, err := Read()
-				assert.Nil(t, err)
-				assert.ElementsMatch(
-					t,
-					cfg.ServicePaths,
-					[]string{
-						path.Join(configDir, serviceDir, "two.sh"),
-					},
-				)
-			},
-		},
-		{
-			name: "wrong mode",
-			testFunc: func(t *testing.T) {
-				mkSvcDir(t)
-				touchFile(t, path.Join(configDir, serviceDir, "one.sh"), 0755)
-				touchFile(t, path.Join(configDir, serviceDir, "two.sh"), 0644)
-
-				cfg, err := Read()
-				assert.Nil(t, err)
-				assert.ElementsMatch(
-					t,
-					cfg.ServicePaths,
-					[]string{
-						path.Join(configDir, serviceDir, "one.sh"),
-					},
-				)
-			},
-		},
-		{
-			name: "empty",
-			testFunc: func(t *testing.T) {
-				mkSvcDir(t)
-
-				_, err := Read()
-				assert.NotNil(t, err)
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			setup(t)
-			tt.testFunc(t)
-			tear(t)
-		})
-	}
-}

config/crontab.go

@@ -28,6 +28,14 @@ type CronTimeSpec interface {
 	Match(uint8) bool
 }
 
+// type Cron interface {
+// 	Minute() CronTimeSpec
+// 	Hour() CronTimeSpec
+// 	DayOfMonth() CronTimeSpec
+// 	Month() CronTimeSpec
+// 	DayOfWeek() CronTimeSpec
+// }
+
 type Cron struct {
 	minute  CronTimeSpec
 	hour    CronTimeSpec
@@ -89,27 +97,27 @@ func readCrontab(path string) ([]*Cron, error) {
 			hasRun: false,
 		}
 		if err = c.setField(minute, parts[1]); err != nil {
-			wingmate.Log().Error().Msgf("error parsing minute field %+v", err)
+			wingmate.Log().Error().Msgf("error parsing minute field %#v", err)
 			continue
 		}
 
 		if err = c.setField(hour, parts[2]); err != nil {
-			wingmate.Log().Error().Msgf("error parsing hour field %+v", err)
+			wingmate.Log().Error().Msgf("error parsing hour field %#v", err)
 			continue
 		}
 
 		if err = c.setField(dom, parts[3]); err != nil {
-			wingmate.Log().Error().Msgf("error parsing day of month field %+v", err)
+			wingmate.Log().Error().Msgf("error parsing day of month field %#v", err)
 			continue
 		}
 
 		if err = c.setField(month, parts[4]); err != nil {
-			wingmate.Log().Error().Msgf("error parsing month field %+v", err)
+			wingmate.Log().Error().Msgf("error parsing month field %#v", err)
 			continue
 		}
 
 		if err = c.setField(dow, parts[5]); err != nil {
-			wingmate.Log().Error().Msgf("error parsing day of week field %+v", err)
+			wingmate.Log().Error().Msgf("error parsing day of week field %#v", err)
 			continue
 		}
 
@@ -126,26 +134,23 @@ func (c *Cron) Command() string {
 }
 
 func (c *Cron) TimeToRun(now time.Time) bool {
+	if !c.hasRun {
+		c.lastRun = now
+		c.hasRun = true
+		return true
+	}
+
+	if now.Sub(c.lastRun) <= time.Minute && now.Minute() == c.lastRun.Minute() {
+		return false
+	}
+
 	if c.minute.Match(uint8(now.Minute())) &&
 		c.hour.Match(uint8(now.Hour())) &&
 		c.dom.Match(uint8(now.Day())) &&
 		c.month.Match(uint8(now.Month())) &&
 		c.dow.Match(uint8(now.Weekday())) {
-
-		if c.hasRun {
-			if now.Sub(c.lastRun) <= time.Minute && now.Minute() == c.lastRun.Minute() {
-				return false
-			} else {
-				c.lastRun = now
 		return true
 	}
-		} else {
-
-			c.lastRun = now
-			c.hasRun = true
-			return true
-		}
-	}
 
 	return false
 }
@@ -203,12 +208,12 @@ func (c *Cron) setField(field cronField, input string) error {
 		*cField = &specAny{}
 	} else if strings.HasPrefix(input, "*/") {
 		if parsed64, err = strconv.ParseUint(input[2:], 10, 8); err != nil {
-			return fmt.Errorf("error parse field %+v with input %s: %w", field, input, err)
+			return fmt.Errorf("error parse field %#v with input %s: %w", field, input, err)
 		}
 
 		parsed = uint8(parsed64)
-		if !fr.valid(parsed) {
-			return fmt.Errorf("error parse field %+v with input %s parsed to %d: invalid value", field, input, parsed)
+		if fr.valid(parsed) {
+			return fmt.Errorf("error parse field %#v with input %s: invalid value", field, input)
 		}
 		multi = make([]uint8, 0)
 		current = parsed
@@ -226,12 +231,12 @@ func (c *Cron) setField(field cronField, input string) error {
 			multi = make([]uint8, 0)
 			for _, s := range multiStr {
 				if parsed64, err = strconv.ParseUint(s, 10, 8); err != nil {
-					return fmt.Errorf("error parse field %+v with input %s: %w", field, input, err)
+					return fmt.Errorf("error parse field %#v with input %s: %w", field, input, err)
 				}
 
 				parsed = uint8(parsed64)
-				if !fr.valid(parsed) {
-					return fmt.Errorf("error parse field %+v with input %s: invalid value", field, input)
+				if fr.valid(parsed) {
+					return fmt.Errorf("error parse field %#v with input %s: invalid value", field, input)
 				}
 
 				multi = append(multi, parsed)
@@ -242,12 +247,12 @@ func (c *Cron) setField(field cronField, input string) error {
 			}
 		} else {
 			if parsed64, err = strconv.ParseUint(input, 10, 8); err != nil {
-				return fmt.Errorf("error parse field %+v with input %s: %w", field, input, err)
+				return fmt.Errorf("error parse field %#v with input %s: %w", field, input, err)
 			}
 
 			parsed = uint8(parsed64)
-			if !fr.valid(parsed) {
-				return fmt.Errorf("error parse field %+v with input %s: invalid value", field, input)
+			if fr.valid(parsed) {
+				return fmt.Errorf("error parse field %#v with input %s: invalid value", field, input)
 			}
 
 			*cField = &specExact{

docker/alpine/Dockerfile

@@ -1,19 +0,0 @@
-FROM golang:1.21-alpine as builder
-
-ADD . /root/wingmate
-WORKDIR /root/wingmate/
-RUN apk add make build-base && CGO_ENABLED=1 make all && make DESTDIR=/usr/local/bin/wingmate install
-
-
-
-FROM alpine:3.18
-
-RUN apk add tzdata && ln -s /usr/share/zoneinfo/Australia/Sydney /etc/localtime && \
-    adduser -h /home/user1 -D -s /bin/sh user1 && \
-    adduser -h /home/user2 -D -s /bin/sh user2
-COPY --from=builder /usr/local/bin/wingmate/ /usr/local/bin/
-ADD --chmod=755 docker/alpine/entry.sh /usr/local/bin/entry.sh
-ADD --chmod=755 docker/alpine/etc /etc
-
-ENTRYPOINT [ "/usr/local/bin/entry.sh" ]
-CMD [ "/usr/local/bin/wingmate" ]

docker/alpine/entry.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ $# -gt 0 ]; then
-    exec "$@"
-else
-    exec /usr/local/bin/wingmate
-fi

docker/alpine/etc/wingmate/crontab

@@ -1,3 +0,0 @@
-*/5 * * * * /etc/wingmate/crontab.d/cron1.sh
-17,42 */2 * * * /etc/wingmate/crontab.d/cron2.sh
-7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh

docker/alpine/etc/wingmate/crontab.d/cron1.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron1.log
-export WINGMATE_LOG_MESSAGE="cron executed in minute 5,10,15,20,25,30,35,40,45,50,55"
-
-echo "I'm runnig with dummy=$WINGMATE_DUMMY_PATH, log=$WINGMATE_LOG and mesage=$WINGMATE_LOG_MESSAGE" >> /var/log/debug-cron.log
-
-exec /usr/local/bin/wmoneshot

docker/alpine/etc/wingmate/crontab.d/cron2.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron2.log
-export WINGMATE_LOG_MESSAGE="cron scheduled using 17,42 */2 * * *"
-
-exec /usr/local/bin/wmoneshot

docker/alpine/etc/wingmate/crontab.d/cron3.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron3.log
-export WINGMATE_LOG_MESSAGE="cron entry: 7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh"
-
-exec /usr/local/bin/wmoneshot

docker/alpine/etc/wingmate/service/one.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --setsid --user user1:user1 -- /usr/local/bin/wmstarter

docker/alpine/etc/wingmate/service/spawner.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-export WINGMATE_ONESHOT_PATH=/usr/local/bin/wmoneshot
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --user 1001 -- /usr/local/bin/wmspawner

docker/bookworm/Dockerfile

@@ -1,19 +0,0 @@
-FROM golang:1.21-bookworm as builder
-
-ADD . /root/wingmate
-WORKDIR /root/wingmate/
-RUN make all && make DESTDIR=/usr/local/bin/wingmate install
-
-
-
-FROM debian:bookworm
-
-RUN ln -sf /usr/share/zoneinfo/Australia/Sydney /etc/localtime && \
-    apt update && apt install -y procps && \
-    useradd -m -s /bin/bash user1
-COPY --from=builder /usr/local/bin/wingmate/ /usr/local/bin/
-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" ]

docker/bookworm/entry.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-if [ $# -gt 0 ]; then
-    exec "$@"
-else
-    exec /usr/local/bin/wingmate
-fi

docker/bookworm/etc/wingmate/crontab

@@ -1,3 +0,0 @@
-*/5 * * * * /etc/wingmate/crontab.d/cron1.sh
-17,42 */2 * * * /etc/wingmate/crontab.d/cron2.sh
-7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh

docker/bookworm/etc/wingmate/crontab.d/cron1.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron1.log
-export WINGMATE_LOG_MESSAGE="cron executed in minute 5,10,15,20,25,30,35,40,45,50,55"
-
-echo "I'm runnig with dummy=$WINGMATE_DUMMY_PATH, log=$WINGMATE_LOG and mesage=$WINGMATE_LOG_MESSAGE" >> /var/log/debug-cron.log
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/crontab.d/cron2.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron2.log
-export WINGMATE_LOG_MESSAGE="cron scheduled using 17,42 */2 * * *"
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/crontab.d/cron3.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-export WINGMATE_LOG=/var/log/cron3.log
-export WINGMATE_LOG_MESSAGE="cron entry: 7,19,23,47 22 * * * /etc/wingmate/crontab.d/cron3.sh"
-
-exec /usr/local/bin/wmoneshot

docker/bookworm/etc/wingmate/service/one.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/bash
-
-export DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --setsid --user user1:user1 -- /usr/local/bin/wmstarter

docker/bookworm/etc/wingmate/service/spawner.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/bash
-
-export WINGMATE_ONESHOT_PATH=/usr/local/bin/wmoneshot
-export WINGMATE_DUMMY_PATH=/usr/local/bin/wmdummy
-exec /usr/local/bin/wmexec --user 1200 -- /usr/local/bin/wmspawner

go.mod

@@ -3,8 +3,8 @@ module gitea.suyono.dev/suyono/wingmate
 go 1.21
 
 require (
-	github.com/rs/zerolog v1.31.0
-	github.com/spf13/cobra v1.8.0
+	github.com/rs/zerolog v1.30.0
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.17.0
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/sys v0.15.0
@@ -17,7 +17,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -28,7 +28,6 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect

go.sum

@@ -48,7 +48,6 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
@@ -151,8 +150,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
@@ -169,8 +166,6 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
 github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
-github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
-github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
@@ -188,8 +183,6 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
 github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -201,15 +194,12 @@ github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
-github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=

init/cron.go

@@ -1,7 +1,6 @@
 package init
 
 import (
-	"io"
 	"os/exec"
 	"sync"
 	"time"
@@ -9,61 +8,19 @@ import (
 	"gitea.suyono.dev/suyono/wingmate"
 )
 
-const (
-	cronTag = "cron"
-)
-
 func (i *Init) cron(wg *sync.WaitGroup, cron Cron, exitFlag <-chan any) {
 	defer wg.Done()
 
-	var (
-		iwg    *sync.WaitGroup
-		err    error
-		stdout io.ReadCloser
-		stderr io.ReadCloser
-	)
-
-	ticker := time.NewTicker(time.Second * 30)
+	ticker := time.NewTicker(time.Second * 20)
 cron:
 	for {
 		if cron.TimeToRun(time.Now()) {
-			wingmate.Log().Info().Str(cronTag, cron.Command().Path()).Msg("executing")
 			cmd := exec.Command(cron.Command().Path())
-			iwg = &sync.WaitGroup{}
-
-			if stdout, err = cmd.StdoutPipe(); err != nil {
-				wingmate.Log().Error().Str(cronTag, cron.Command().Path()).Msgf("stdout pipe: %+v", err)
-				goto fail
-			}
-
-			if stderr, err = cmd.StderrPipe(); err != nil {
-				wingmate.Log().Error().Str(cronTag, cron.Command().Path()).Msgf("stderr pipe: %+v", err)
-				_ = stdout.Close()
-				goto fail
-			}
-
-			iwg.Add(1)
-			go i.pipeReader(iwg, stdout, cronTag, cron.Command().Path())
-
-			iwg.Add(1)
-			go i.pipeReader(iwg, stderr, cronTag, cron.Command().Path())
-
-			if err := cmd.Start(); err != nil {
-				wingmate.Log().Error().Msgf("starting cron %s error %+v", cron.Command().Path(), err)
-				_ = stdout.Close()
-				_ = stderr.Close()
-				iwg.Wait()
-				goto fail
-			}
-
-			iwg.Wait()
-
-			if err = cmd.Wait(); err != nil {
-				wingmate.Log().Error().Str(cronTag, cron.Command().Path()).Msgf("got error when waiting: %+v", err)
+			if err := cmd.Run(); err != nil {
+				wingmate.Log().Error().Msgf("running cron %s error %#v", cron.Command().Path(), err)
 			}
 		}
 
-	fail:
 		select {
 		case <-exitFlag:
 			ticker.Stop()

init/init.go

@@ -1,7 +1,6 @@
 package init
 
 import (
-	"os"
 	"sync"
 	"time"
 )
@@ -35,19 +34,17 @@ func (i *Init) Start() {
 		wg             *sync.WaitGroup
 		signalTrigger  chan any
 		sighandlerExit chan any
-		sigchld        chan os.Signal
 	)
 
 	signalTrigger = make(chan any)
 	sighandlerExit = make(chan any)
-	sigchld = make(chan os.Signal, 1)
 
 	wg = &sync.WaitGroup{}
 	wg.Add(1)
-	go i.waiter(wg, signalTrigger, sighandlerExit, sigchld)
+	go i.waiter(wg, signalTrigger, sighandlerExit)
 
 	wg.Add(1)
-	go i.sighandler(wg, signalTrigger, sighandlerExit, sigchld)
+	go i.sighandler(wg, signalTrigger, sighandlerExit)
 
 	for _, s := range i.config.Services() {
 		wg.Add(1)

init/service.go

@@ -1,76 +1,26 @@
 package init
 
 import (
-	"bufio"
-	"io"
 	"os/exec"
 	"sync"
-	"time"
 
 	"gitea.suyono.dev/suyono/wingmate"
 )
 
-const (
-	serviceTag = "service"
-)
-
 func (i *Init) service(wg *sync.WaitGroup, path Path, exitFlag <-chan any) {
 	defer wg.Done()
 
 	var (
 		err error
-		iwg        *sync.WaitGroup
-		stderr     io.ReadCloser
-		stdout     io.ReadCloser
-		failStatus bool
 	)
 
-	defer func() {
-		wingmate.Log().Info().Str(serviceTag, path.Path()).Msg("stopped")
-	}()
-
 service:
 	for {
-		failStatus = false
 		cmd := exec.Command(path.Path())
-		iwg = &sync.WaitGroup{}
-
-		if stdout, err = cmd.StdoutPipe(); err != nil {
-			wingmate.Log().Error().Str(serviceTag, path.Path()).Msgf("stdout pipe: %#v", err)
-			failStatus = true
-			goto fail
-		}
-		iwg.Add(1)
-		go i.pipeReader(iwg, stdout, serviceTag, path.Path())
-
-		if stderr, err = cmd.StderrPipe(); err != nil {
-			wingmate.Log().Error().Str(serviceTag, path.Path()).Msgf("stderr pipe: %#v", err)
-			_ = stdout.Close()
-			failStatus = true
-			goto fail
-		}
-		iwg.Add(1)
-		go i.pipeReader(iwg, stderr, serviceTag, path.Path())
-
-		if err = cmd.Start(); err != nil {
+		if err = cmd.Run(); err != nil {
 			wingmate.Log().Error().Msgf("starting service %s error %#v", path.Path(), err)
-			failStatus = true
-			_ = stdout.Close()
-			_ = stderr.Close()
-			iwg.Wait()
-			goto fail
 		}
 
-		iwg.Wait()
-
-		if err = cmd.Wait(); err != nil {
-			wingmate.Log().Error().Str(serviceTag, path.Path()).Msgf("got error when waiting: %+v", err)
-		}
-	fail:
-		if failStatus {
-			time.Sleep(time.Second)
-			failStatus = false
-		}
 		select {
 		case <-exitFlag:
 			break service
@@ -79,18 +29,3 @@ service:
 	}
 
 }
-
-func (i *Init) pipeReader(wg *sync.WaitGroup, pipe io.ReadCloser, tag, serviceName string) {
-	defer wg.Done()
-
-	scanner := bufio.NewScanner(pipe)
-	for scanner.Scan() {
-		wingmate.Log().Info().Str(tag, serviceName).Msg(scanner.Text())
-	}
-
-	if err := scanner.Err(); err != nil {
-		wingmate.Log().Error().Str(tag, serviceName).Msgf("got error when reading pipe: %#v", err)
-	}
-
-	wingmate.Log().Info().Str(tag, serviceName).Msg("closing pipe")
-}

init/sighandler.go

@@ -5,16 +5,11 @@ import (
 	"os/signal"
 	"sync"
 
-	"gitea.suyono.dev/suyono/wingmate"
 	"golang.org/x/sys/unix"
 )
 
-func (i *Init) sighandler(wg *sync.WaitGroup, trigger chan<- any, selfExit <-chan any, sigchld chan<- os.Signal) {
-	defer wg.Done()
-
-	defer func() {
-		wingmate.Log().Warn().Msg("signal handler: exiting")
-	}()
+func (i *Init) sighandler(wg *sync.WaitGroup, trigger chan<- any, selfExit <-chan any) {
+	defer wg.Wait()
 
 	isOpen := true
 
@@ -28,21 +23,14 @@ signal:
 			switch s {
 			case unix.SIGTERM, unix.SIGINT:
 				if isOpen {
-					wingmate.Log().Info().Msg("initiating shutdown...")
 					close(trigger)
-					wg.Add(1)
-					go i.signalPump(wg, selfExit)
 					isOpen = false
 				}
 			case unix.SIGCHLD:
-				select {
-				case sigchld <- s:
-				default:
-				}
+				// do nothing
 			}
 
 		case <-selfExit:
-			wingmate.Log().Warn().Msg("signal handler received completion flag")
 			break signal
 		}
 	}

init/signal-pump.go

@@ -1,71 +0,0 @@
-package init
-
-import (
-	"sync"
-	"time"
-
-	"gitea.suyono.dev/suyono/wingmate"
-	"golang.org/x/sys/unix"
-)
-
-type status int
-
-const (
-	triggered status = iota
-	expired
-)
-
-func (i *Init) signalPump(wg *sync.WaitGroup, selfExit <-chan any) {
-	defer wg.Done()
-	defer func() {
-		wingmate.Log().Info().Msg("signal pump completed")
-	}()
-
-	if seStatus := i.sigTermPump(time.Now(), selfExit); seStatus == triggered {
-		return
-	}
-
-	i.sigKillPump(time.Now(), selfExit)
-}
-
-func (i *Init) sigKillPump(startTime time.Time, selfExit <-chan any) {
-	t := time.NewTicker(time.Millisecond * 200)
-	defer t.Stop()
-
-	wingmate.Log().Info().Msg("start pumping SIGKILL signal")
-	defer func() {
-		wingmate.Log().Info().Msg("stop pumping SIGKILL signal")
-	}()
-
-	for time.Since(startTime) < time.Second {
-		_ = unix.Kill(-1, unix.SIGKILL)
-
-		select {
-		case <-t.C:
-		case <-selfExit:
-			return
-		}
-	}
-}
-
-func (i *Init) sigTermPump(startTime time.Time, selfExit <-chan any) status {
-	t := time.NewTicker(time.Millisecond * 100)
-	defer t.Stop()
-
-	wingmate.Log().Info().Msg("start pumping SIGTERM signal")
-	defer func() {
-		wingmate.Log().Info().Msg("stop pumping SIGTERM signal")
-	}()
-
-	for time.Since(startTime) < time.Duration(time.Second*4) {
-		_ = unix.Kill(-1, unix.SIGTERM)
-
-		select {
-		case <-t.C:
-		case <-selfExit:
-			return triggered
-		}
-	}
-
-	return expired
-}

init/waiter.go

@@ -2,68 +2,35 @@ package init
 
 import (
 	"errors"
-	"os"
 	"sync"
 
-	"gitea.suyono.dev/suyono/wingmate"
 	"golang.org/x/sys/unix"
 )
 
-func (i *Init) waiter(wg *sync.WaitGroup, runningFlag <-chan any, sigHandlerFlag chan<- any, sigchld <-chan os.Signal) {
+func (i *Init) waiter(wg *sync.WaitGroup, runningFlag <-chan any, sigHandlerFlag chan<- any) {
 	var (
 		ws unix.WaitStatus
+		// pid     int
 		err     error
 		running bool
-		flagged          bool
-		waitingForSignal bool
 	)
-	defer wg.Done()
-
-	defer func() {
-		wingmate.Log().Info().Msg("waiter exiting...")
-	}()
 
 	running = true
-	flagged = true
-	waitingForSignal = true
 wait:
 	for {
-		if running {
-			if waitingForSignal {
 		select {
 		case <-runningFlag:
-					wingmate.Log().Info().Msg("waiter received shutdown signal...")
-					running = false
-				case <-sigchld:
-					waitingForSignal = false
-				}
-
-			} else {
-				select {
-				case <-runningFlag:
-					wingmate.Log().Info().Msg("waiter received shutdown signal...")
 			running = false
 		default:
 		}
 
-			}
-		}
-
 		if _, err = unix.Wait4(-1, &ws, 0, nil); err != nil {
 			if errors.Is(err, unix.ECHILD) {
 				if !running {
-					if flagged {
 					close(sigHandlerFlag)
-						flagged = false
-						wingmate.Log().Warn().Msg("waiter: inner flag")
-					}
-					wingmate.Log().Warn().Msg("waiter: no child left")
 					break wait
 				}
 			}
-
-			wingmate.Log().Warn().Msgf("Wait4 returns error: %+v", err)
-			waitingForSignal = true
 		}
 	}
 }

logger.go

@@ -1,15 +1,9 @@
 package wingmate
 
 import (
-	"io"
-	"time"
-
 	"gitea.suyono.dev/suyono/wingmate/logger"
 	"github.com/rs/zerolog"
-)
-
-const (
-	timeTag = "time"
+	"io"
 )
 
 var (
@@ -35,28 +29,13 @@ func Log() logger.Log {
 }
 
 func (w *wrapper) Info() logger.Content {
-	return (*eventWrapper)(w.log.Info().Time(timeTag, time.Now()))
+	return w.log.Info()
 }
 
 func (w *wrapper) Warn() logger.Content {
-	return (*eventWrapper)(w.log.Warn().Time(timeTag, time.Now()))
+	return w.log.Warn()
 }
 
 func (w *wrapper) Error() logger.Content {
-	return (*eventWrapper)(w.log.Error().Time(timeTag, time.Now()))
-}
-
-type eventWrapper zerolog.Event
-
-func (w *eventWrapper) Msg(msg string) {
-	(*zerolog.Event)(w).Msg(msg)
-}
-
-func (w *eventWrapper) Msgf(format string, data ...any) {
-	(*zerolog.Event)(w).Msgf(format, data...)
-}
-
-func (w *eventWrapper) Str(key, value string) logger.Content {
-	rv := (*zerolog.Event)(w).Str(key, value)
-	return (*eventWrapper)(rv)
+	return w.log.Error()
 }

logger/logger.go

@@ -3,7 +3,6 @@ package logger
 type Content interface {
 	Msg(string)
 	Msgf(string, ...any)
-	Str(string, string) Content
 }
 
 type Level interface {

types.go

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