alex/triggerssmith
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
Alexey
2025-11-30 12:50:38 +02:00
parent 004bb7ef7f
commit c1e5fc90ee
9 changed files with 140 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/reload.go
View File

@@ -58,8 +58,13 @@ var reloadCmd = &cobra.Command{
if err != nil {
slog.Error("failed to find process", slog.Int("pid", *optsReloadCmd.PID), slog.String("err", err.Error()))
}
proc.Signal(syscall.SIGHUP)
slog.Debug("done")
err = proc.Signal(syscall.SIGHUP)
if err != nil {
slog.Error("failed to reload process", slog.Int("pid", *optsReloadCmd.PID), slog.String("err", err.Error()))
} else {
slog.Debug("done")
}
},
}

48
cmd/serve.go
View File

@@ -10,8 +10,10 @@ import (
"syscall"
"time"
"git.oblat.lv/alex/triggerssmith/api"
application "git.oblat.lv/alex/triggerssmith/internal/app"
"git.oblat.lv/alex/triggerssmith/internal/config"
"git.oblat.lv/alex/triggerssmith/internal/server"
"git.oblat.lv/alex/triggerssmith/internal/vars"
"github.com/spf13/cobra"
)
@@ -97,22 +99,24 @@ var serveCmd = &cobra.Command{
}
app.LoadConfiguration(cfg)
server := app.Server()
mux := http.NewServeMux()
srv := app.Server()
//mux := http.NewServeMux()
// static files
staticPath := cfg.Server.StaticFilesPath
slog.Debug("Setting up static file server", slog.String("path", staticPath))
fs := http.FileServer(http.Dir(staticPath))
mux.Handle("/static/", http.StripPrefix("/static/", fs))
handler := loggingMiddleware(mux)
// staticPath := cfg.Server.StaticFilesPath
// slog.Debug("Setting up static file server", slog.String("path", staticPath))
// fs := http.FileServer(http.Dir(staticPath))
// mux.Handle("/static/", http.StripPrefix("/static/", fs))
// handler := loggingMiddleware(mux)
server.SetHandler(handler)
server.Init()
router := api.NewRouter(cfg)
srv.SetHandler(router.RouteHandler())
srv.Init()
var addr = net.JoinHostPort(cfg.Server.Addr, fmt.Sprintf("%d", cfg.Server.Port))
slog.Debug("Binding listener", slog.String("address", addr))
err = server.Start(addr)
err = srv.Start(addr)
if err != nil {
slog.Error("Failed to start server", slog.String("error", err.Error()))
return
@@ -133,28 +137,30 @@ var serveCmd = &cobra.Command{
slog.Info("Configuration reloaded")
var addr = net.JoinHostPort(cfg.Server.Addr, fmt.Sprintf("%d", cfg.Server.Port))
slog.Debug("New configuration", slog.Any("config", cfg))
err = server.Reload(addr)
err = srv.Reload(addr)
if err != nil {
slog.Error("Failed to restart server with new configuration", slog.String("error", err.Error()))
}
}
case syscall.SIGINT:
slog.Info("Stopping server by SIGINT")
err := server.Stop()
if err != nil {
slog.Error("Failed to stop server", slog.String("err", err.Error()))
os.Exit(1)
}
os.Remove(vars.PID_PATH)
_ = server.StopAll()
//err := srv.Stop()
// if err != nil {
// slog.Error("Failed to stop server", slog.String("err", err.Error()))
// os.Exit(1)
// }
return
case syscall.SIGTERM:
slog.Info("Stopping server by SIGTERM")
err := server.Stop()
if err != nil {
slog.Error("Failed to stop server", slog.String("err", err.Error()))
os.Exit(1)
}
os.Remove(vars.PID_PATH)
_ = server.StopAll()
//err := srv.Stop()
// if err != nil {
// slog.Error("Failed to stop server", slog.String("err", err.Error()))
// os.Exit(1)
// }
return
}
}

15
cmd/stop.go
View File

@@ -41,12 +41,21 @@ var stopCmd = &cobra.Command{
}
if *optsStopCmd.Force {
slog.Debug("force stopping server by SIGKILL", slog.Int("pid", *optsStopCmd.PID))
proc.Signal(syscall.SIGKILL)
err = proc.Signal(syscall.SIGKILL)
if err != nil {
slog.Error("failed to reload process", slog.Int("pid", *optsReloadCmd.PID), slog.String("err", err.Error()))
} else {
slog.Debug("done")
}
} else {
slog.Debug("stopping server", slog.Int("pid", *optsStopCmd.PID))
proc.Signal(syscall.SIGTERM)
err = proc.Signal(syscall.SIGTERM)
if err != nil {
slog.Error("failed to reload process", slog.Int("pid", *optsReloadCmd.PID), slog.String("err", err.Error()))
} else {
slog.Debug("done")
}
}
slog.Debug("done")
},
}