chore: quick update feat/supervisor at 2025-10-20 12:48:51

Author: kooksee

cmds/depcmd/cmd.go

@@ -15,14 +15,14 @@ import (
 	"github.com/pubgo/funk/v2/running"
 	cli "github.com/urfave/cli/v3"
 
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 )
 
 func New(di *dix.Dix) *cli.Command {
 	return &cli.Command{
 		Name:  "dep",
 		Usage: "Print the dependency package information",
-		Description: cmdutil.ExampleFmt(
+		Description: cliutil.ExampleDesc(
 			"lava dep",
 			"lava dep json",
 			"lava dep t"),

cmds/grpcservercmd/cmd.go

@@ -10,14 +10,14 @@ import (
 
 	"github.com/pubgo/lava/v2/core/lifecycle"
 	"github.com/pubgo/lava/v2/core/supervisor"
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 	"github.com/pubgo/lava/v2/servers/grpcs"
 )
 
 func New(di *dix.Dix) *cli.Command {
 	return &cli.Command{
 		Name:  "grpc",
-		Usage: cmdutil.UsageDesc("grpc service %s(%s)", version.Project(), version.Version()),
+		Usage: cliutil.UsageDesc("grpc service %s(%s)", version.Project(), version.Version()),
 		Action: func(ctx context.Context, command *cli.Command) error {
 			di.Provide(grpcs.New)
 			params := dix.Inject(di, new(struct {

cmds/healthcmd/cmd.go

@@ -12,15 +12,15 @@ import (
 	"github.com/pubgo/funk/v2/recovery"
 	"github.com/urfave/cli/v3"
 
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 	"github.com/pubgo/lava/v2/pkg/netutil"
 )
 
 func New() *cli.Command {
 	return &cli.Command{
 		Name:  "health",
-		Usage: cmdutil.UsageDesc("%s health check", version.Project()),
-		Description: cmdutil.ExampleFmt(
+		Usage: cliutil.UsageDesc("%s health check", version.Project()),
+		Description: cliutil.ExampleDesc(
 			"lava health",
 			"lava health localhost:8080",
 		),

cmds/httpservercmd/cmd.go

@@ -10,14 +10,14 @@ import (
 
 	"github.com/pubgo/lava/v2/core/lifecycle"
 	"github.com/pubgo/lava/v2/core/supervisor"
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 	"github.com/pubgo/lava/v2/servers/https"
 )
 
 func New(di *dix.Dix) *cli.Command {
 	return &cli.Command{
 		Name:  "http",
-		Usage: cmdutil.UsageDesc("%s http service", version.Project()),
+		Usage: cliutil.UsageDesc("%s http service", version.Project()),
 		Action: func(ctx context.Context, command *cli.Command) error {
 			di.Provide(https.New)
 			params := dix.Inject(di, new(struct {

cmds/schedulercmd/cmd.go

@@ -13,14 +13,14 @@ import (
 	"github.com/pubgo/lava/v2/core/scheduler/schedulerbuilder"
 	"github.com/pubgo/lava/v2/core/scheduler/schedulerdebug"
 	"github.com/pubgo/lava/v2/core/supervisor"
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 	"github.com/pubgo/lava/v2/servers/https"
 )
 
 func New(di *dix.Dix) *cli.Command {
 	return &cli.Command{
 		Name:  "scheduler",
-		Usage: cmdutil.UsageDesc("crontab scheduler service %s(%s)", version.Project(), version.Version()),
+		Usage: cliutil.UsageDesc("crontab scheduler service %s(%s)", version.Project(), version.Version()),
 		Action: func(ctx context.Context, command *cli.Command) error {
 			di.Provide(schedulerbuilder.NewService)
 			di.Provide(https.New)

cmds/versioncmd/cmd.go

@@ -7,15 +7,15 @@ import (
 	"github.com/pubgo/funk/v2/buildinfo/version"
 	"github.com/pubgo/funk/v2/recovery"
 	"github.com/pubgo/funk/v2/running"
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 	"github.com/urfave/cli/v3"
 )
 
 func New() *cli.Command {
 	return &cli.Command{
 		Name:    "version",
 		Aliases: []string{"v"},
-		Usage:   cmdutil.UsageDesc("%s version info", version.Project()),
+		Usage:   cliutil.UsageDesc("%s version info", version.Project()),
 		Action: func(ctx context.Context, command *cli.Command) error {
 			defer recovery.Exit()
 			fmt.Println("project:", version.Project())

core/lavabuilder/builder.go

@@ -27,7 +27,7 @@ import (
 	"github.com/pubgo/lava/v2/core/logging/logbuilder"
 	"github.com/pubgo/lava/v2/core/metrics/metricbuilder"
 	"github.com/pubgo/lava/v2/core/signals"
-	"github.com/pubgo/lava/v2/pkg/cmdutil"
+	"github.com/pubgo/lava/v2/pkg/cliutil"
 
 	_ "github.com/pubgo/lava/v2/core/debug/debug"
 	//_ "github.com/pubgo/lava/v2/core/debug/gops"
@@ -91,7 +91,7 @@ func Run(di *dix.Dix) {
 			Name:                   version.Project(),
 			Suggest:                true,
 			UseShortOptionHandling: true,
-			Usage:                  cmdutil.UsageDesc("%s service", version.Project()),
+			Usage:                  cliutil.UsageDesc("%s service", version.Project()),
 			Version:                version.Version(),
 			Flags:                  append(flags.GetFlags(), featureflags.GetFlags()...),
 			Commands:               cmd,

core/pidfile/pidfile.go

@@ -5,67 +5,52 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"syscall"
+	"sync"
 
 	"github.com/pubgo/funk/v2/config"
-	"github.com/pubgo/funk/v2/log"
 	"github.com/pubgo/funk/v2/log/logfields"
-	"github.com/pubgo/funk/v2/pathutil"
 	"github.com/pubgo/funk/v2/result"
 	"github.com/pubgo/funk/v2/running"
 	"github.com/rs/zerolog"
 )
 
-const Name = "pidfile"
-
-var PidPath = filepath.Join(config.GetConfigDir(), Name)
+var getPidPath = sync.OnceValue(func() string {
+	return filepath.Join(config.GetConfigDir(), "."+running.Project()+".pid")
+})
 
 const pidPerm os.FileMode = 0o644
 
 func Get() (r result.Result[int]) {
-	pidPath := GetPath().Unwrap(&r)
+	pidPath := GetPath()
+	p := result.Wrap(os.ReadFile(pidPath)).
+		Validate(func(val []byte) error {
+			if len(val) == 0 {
+				return fmt.Errorf("pid file is empty")
+			}
+			return nil
+		}).
+		Log(func(e *zerolog.Event) {
+			e.Str("path", pidPath)
+			e.Str(logfields.Msg, "read pid file failed")
+		}).
+		Unwrap(&r)
 	if r.IsErr() {
 		return
 	}
 
-	p, err := os.ReadFile(pidPath)
-	if err != nil {
-		return r.WithErrorf("failed to read pid file: %s", pidPath)
-	}
-
-	if len(p) == 0 {
-		return r.WithErrorf("pid file is empty")
-	}
-
 	return result.Wrap(strconv.Atoi(string(p))).
-		InspectErr(func(err error) {
-			log.Err(err).Str("path", pidPath).Str("pid", string(p)).Msg("read pid file failed")
+		Log(func(e *zerolog.Event) {
+			e.Str("path", pidPath)
+			e.Str("pid", string(p))
+			e.Str(logfields.Msg, "convert pid to int failed")
 		})
 }
 
-func GetPath() (r result.Result[string]) {
-	filename := fmt.Sprintf("%s.pid", running.Project())
-	pidPath := filepath.Join(PidPath, filename)
-
-	if pathutil.IsNotExist(PidPath) {
-		createDirRes := result.ErrOf(os.MkdirAll(PidPath, os.ModePerm)).Log(func(e *zerolog.Event) {
-			e.Str(logfields.Msg, fmt.Sprintf("create pid file dir(%s) failed", PidPath))
-		})
-		if createDirRes.Catch(&r) {
-			return
-		}
-	}
-
-	return r.WithValue(pidPath)
-}
+func GetPath() string { return getPidPath() }
 
 func Save() (r result.Error) {
-	pidPath := GetPath().Unwrap(&r)
-	if r.IsErr() {
-		return
-	}
-
-	pid := syscall.Getpid()
+	pidPath := GetPath()
+	pid := os.Getpid()
 
 	return result.ErrOf(os.WriteFile(pidPath, []byte(strconv.Itoa(pid)), pidPerm)).
 		Log(func(e *zerolog.Event) {

core/pidfile/pidfilebuilder/builder.go

@@ -2,21 +2,13 @@ package pidfilebuilder
 
 import (
 	"context"
-	"path/filepath"
-
-	"github.com/pubgo/funk/v2/config"
-	"github.com/pubgo/funk/v2/pathutil"
 
 	"github.com/pubgo/lava/v2/core/lifecycle"
 	"github.com/pubgo/lava/v2/core/pidfile"
 )
 
 func New() lifecycle.Handler {
 	return func(lc lifecycle.Lifecycle) {
-		pidfile.PidPath = filepath.Join(config.GetConfigDir(), pidfile.Name)
-
-		_ = pathutil.IsNotExistMkDir(pidfile.PidPath)
-
 		lc.AfterStart(func(ctx context.Context) error { return pidfile.Save().GetErr() })
 	}
 }

core/supervisor/manager.go

@@ -18,6 +18,7 @@ import (
 	"github.com/pubgo/lava/v2/core/debug"
 	"github.com/pubgo/lava/v2/core/lifecycle"
 	"github.com/pubgo/lava/v2/internal/logutil"
+	"github.com/pubgo/lava/v2/pkg/netutil"
 )
 
 type serviceWrapper struct {
@@ -148,7 +149,7 @@ func (m *Manager) Services() []Service {
 
 func (m *Manager) start(ctx context.Context) error {
 	defer recovery.Exit()
-	logutil.OkOrFailed(m.logger, "service before-start", func() error {
+	logutil.OkOrFailed(m.logger, "start lifecycle before service", func() error {
 		defer recovery.Exit()
 		for _, run := range m.lc.GetBeforeStarts() {
 			m.logger.Info().Msgf("running %s", stack.CallerWithFunc(run.Exec))
@@ -159,14 +160,14 @@ func (m *Manager) start(ctx context.Context) error {
 
 	async.GoDelay(func() error {
 		err := m.supervisor.Serve(ctx)
-		if errors.Is(err, context.Canceled) {
+		if netutil.IsErrServerClosed(err) {
 			return nil
 		}
 		assert.Exit(err)
 		return nil
 	})
 
-	logutil.OkOrFailed(m.logger, "service after-start", func() error {
+	logutil.OkOrFailed(m.logger, "start lifecycle after service", func() error {
 		defer recovery.Exit()
 		for _, run := range m.lc.GetAfterStarts() {
 			m.logger.Info().Msgf("running %s", stack.CallerWithFunc(run.Exec))
@@ -181,7 +182,7 @@ func (m *Manager) start(ctx context.Context) error {
 func (m *Manager) stop(ctx context.Context) error {
 	defer recovery.DebugPrint()
 
-	logutil.OkOrFailed(m.logger, "service before-stop", func() error {
+	logutil.OkOrFailed(m.logger, "stop lifecycle before service", func() error {
 		for _, run := range m.lc.GetBeforeStops() {
 			logutil.LogOrErr(m.logger, fmt.Sprintf("running %s", stack.CallerWithFunc(run.Exec)), func() error {
 				return run.Exec(ctx)
@@ -198,7 +199,7 @@ func (m *Manager) stop(ctx context.Context) error {
 		return errors.New("services are still running")
 	}
 
-	logutil.OkOrFailed(m.logger, "service after-stop", func() error {
+	logutil.OkOrFailed(m.logger, "stop lifecycle after service", func() error {
 		for _, run := range m.lc.GetAfterStops() {
 			logutil.LogOrErr(m.logger, fmt.Sprintf("running %s", stack.CallerWithFunc(run.Exec)), func() error {
 				return run.Exec(ctx)
@@ -224,7 +225,7 @@ func (m *Manager) Run(ctx context.Context) error {
 func (m *Manager) Serve(ctx context.Context) error {
 	err := m.supervisor.Serve(ctx)
 
-	if errors.Is(err, context.Canceled) {
+	if netutil.IsErrServerClosed(err) {
 		return nil
 	}