alex/GoSally
2
0
Fork 0
mirror of https://github.com/akyaiy/GoSally-mvp.git synced 2026-01-03 17:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

make fields in configuration structures pointers, fix errors in code related to this change

Browse Source
This commit is contained in:
Alexey
2025-07-30 19:19:02 +03:00
parent 299fd59e19
commit 23ed707029
5 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
hooks/initial.go
View File

@@ -10,6 +10,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"slices" "slices"
"strings"
"syscall" "syscall"
"time" "time"
@@ -49,12 +50,12 @@ func Init2Hook(cs *corestate.CoreState, x *app.AppX) {
if err := x.Config.LoadEnv(); err != nil { if err := x.Config.LoadEnv(); err != nil {
x.Log.Fatalf("env load error: %s", err) x.Log.Fatalf("env load error: %s", err)
} }
cs.NodePath = x.Config.Env.NodePath cs.NodePath = *x.Config.Env.NodePath
if cfgPath := x.Config.CMDLine.Run.ConfigPath; cfgPath != "" { if cfgPath := x.Config.CMDLine.Run.ConfigPath; cfgPath != "" {
x.Config.Env.ConfigPath = cfgPath x.Config.Env.ConfigPath = &cfgPath
} }
if err := x.Config.LoadConf(x.Config.Env.ConfigPath); err != nil { if err := x.Config.LoadConf(*x.Config.Env.ConfigPath); err != nil {
x.Log.Fatalf("conf load error: %s", err) x.Log.Fatalf("conf load error: %s", err)
} }
} }
@@ -77,10 +78,7 @@ func Init3Hook(cs *corestate.CoreState, x *app.AppX) {
} }
func Init4Hook(cs *corestate.CoreState, x *app.AppX) { func Init4Hook(cs *corestate.CoreState, x *app.AppX) {
if x.Config.Env.ParentStagePID != os.Getpid() { if *x.Config.Env.ParentStagePID != os.Getpid() {
if !slices.Contains(x.Config.Conf.DisableWarnings, "--WNonStdTmpDir") && os.TempDir() != "/tmp" {
x.Log.Printf("%s: %s", logs.PrintWarn(), "Non-standard value specified for temporary directory")
}
// still pre-init stage // still pre-init stage
runDir, err := run_manager.Create(cs.UUID32) runDir, err := run_manager.Create(cs.UUID32)
if err != nil { if err != nil {
@@ -174,6 +172,16 @@ func Init5Hook(cs *corestate.CoreState, x *app.AppX) {
} }
func Init6Hook(cs *corestate.CoreState, x *app.AppX) { func Init6Hook(cs *corestate.CoreState, x *app.AppX) {
if !slices.Contains(*x.Config.Conf.DisableWarnings, "--WNonStdTmpDir") && os.TempDir() != "/tmp" {
x.Log.Printf("%s: %s", logs.PrintWarn(), "Non-standard value specified for temporary directory")
}
if strings.Contains(*x.Config.Conf.Log.OutPath, `%tmp%`) {
replaced := strings.ReplaceAll(*x.Config.Conf.Log.OutPath, "%tmp%", filepath.Clean(run_manager.RuntimeDir()))
x.Config.Conf.Log.OutPath = &replaced
}
}
func Init7Hook(cs *corestate.CoreState, x *app.AppX) {
cs.Stage = corestate.StageReady cs.Stage = corestate.StageReady
x.Log.SetPrefix(logs.SetGreen(fmt.Sprintf("(%s) ", cs.Stage))) x.Log.SetPrefix(logs.SetGreen(fmt.Sprintf("(%s) ", cs.Stage)))
@@ -185,3 +193,27 @@ func Init6Hook(cs *corestate.CoreState, x *app.AppX) {
} }
*x.SLog = *newSlog *x.SLog = *newSlog
} }
// repl := map[string]string{
// "tmp": filepath.Clean(run_manager.RuntimeDir()),
// }
// re := regexp.MustCompile(`%(\w+)%`)
// result := re.ReplaceAllStringFunc(x.Config.Conf.Log.OutPath, func(match string) string {
// sub := re.FindStringSubmatch(match)
// if len(sub) < 2 {
// return match
// }
// key := sub[1]
// if val, ok := repl[key]; ok {
// return val
// }
// return match
// })
// if strings.Contains(x.Config.Conf.Log.OutPath, "%tmp%") {
// relPath := strings.TrimPrefix(result, filepath.Clean(run_manager.RuntimeDir()))
// if err := run_manager.SetDir(relPath); err != nil {
// _ = run_manager.Clean()
// x.Log.Fatalf("Unexpected failure: %s", err.Error())
// }
// }

8
internal/core/update/update.go
View File

@@ -134,7 +134,7 @@ func (u *Updater) GetCurrentVersion() (Version, Branch, error) {
} }
func (u *Updater) GetLatestVersion(updateBranch Branch) (Version, Branch, error) { func (u *Updater) GetLatestVersion(updateBranch Branch) (Version, Branch, error) {
repoURL := u.x.Config.Conf.Updates.RepositoryURL repoURL := *u.x.Config.Conf.Updates.RepositoryURL
if repoURL == "" { if repoURL == "" {
u.x.Log.Printf("Failed to get latest version: %s", "RepositoryURL is empty in config") u.x.Log.Printf("Failed to get latest version: %s", "RepositoryURL is empty in config")
return "", "", errors.New("repository URL is empty") return "", "", errors.New("repository URL is empty")
@@ -192,7 +192,7 @@ func (u *Updater) CkeckUpdates() (IsNewUpdate, error) {
} }
func (u *Updater) Update() error { func (u *Updater) Update() error {
if !u.x.Config.Conf.Updates.UpdatesEnabled { if !*u.x.Config.Conf.Updates.UpdatesEnabled {
return errors.New("updates are disabled in config, skipping update") return errors.New("updates are disabled in config, skipping update")
} }
@@ -212,7 +212,7 @@ func (u *Updater) Update() error {
} }
updateArchiveName := fmt.Sprintf("%s.v%s-%s", config.UpdateArchiveName, latestVersion, latestBranch) updateArchiveName := fmt.Sprintf("%s.v%s-%s", config.UpdateArchiveName, latestVersion, latestBranch)
updateDest := fmt.Sprintf("%s/%s.%s", u.x.Config.Conf.Updates.RepositoryURL, updateArchiveName, "tar.gz") updateDest := fmt.Sprintf("%s/%s.%s", *u.x.Config.Conf.Updates.RepositoryURL, updateArchiveName, "tar.gz")
resp, err := http.Get(updateDest) resp, err := http.Get(updateDest)
if err != nil { if err != nil {
@@ -278,7 +278,7 @@ func (u *Updater) Update() error {
func (u *Updater) InstallAndRestart() error { func (u *Updater) InstallAndRestart() error {
nodePath := u.x.Config.Env.NodePath nodePath := *u.x.Config.Env.NodePath
if nodePath == "" { if nodePath == "" {
return errors.New("GS_NODE_PATH environment variable is not set") return errors.New("GS_NODE_PATH environment variable is not set")
} }

46
internal/engine/config/config.go
View File

@@ -18,45 +18,45 @@ type Compositor struct {
} }
type Conf struct { type Conf struct {
Mode string `mapstructure:"mode"` Mode *string `mapstructure:"mode"`
ComDir string `mapstructure:"com_dir"` ComDir *string `mapstructure:"com_dir"`
HTTPServer HTTPServer `mapstructure:"http_server"` HTTPServer *HTTPServer `mapstructure:"http_server"`
TLS TLS `mapstructure:"tls"` TLS *TLS `mapstructure:"tls"`
Updates Updates `mapstructure:"updates"` Updates *Updates `mapstructure:"updates"`
Log Log `mapstructure:"log"` Log *Log `mapstructure:"log"`
DisableWarnings []string `mapstructure:"disable_warnings"` DisableWarnings *[]string `mapstructure:"disable_warnings"`
} }
type HTTPServer struct { type HTTPServer struct {
Address string `mapstructure:"address"` Address *string `mapstructure:"address"`
Port string `mapstructure:"port"` Port *string `mapstructure:"port"`
Timeout time.Duration `mapstructure:"timeout"` Timeout *time.Duration `mapstructure:"timeout"`
IdleTimeout time.Duration `mapstructure:"idle_timeout"` IdleTimeout *time.Duration `mapstructure:"idle_timeout"`
} }
type TLS struct { type TLS struct {
TlsEnabled bool `mapstructure:"enabled"` TlsEnabled *bool `mapstructure:"enabled"`
CertFile string `mapstructure:"cert_file"` CertFile *string `mapstructure:"cert_file"`
KeyFile string `mapstructure:"key_file"` KeyFile *string `mapstructure:"key_file"`
} }
type Updates struct { type Updates struct {
UpdatesEnabled bool `mapstructure:"enabled"` UpdatesEnabled *bool `mapstructure:"enabled"`
CheckInterval time.Duration `mapstructure:"check_interval"` CheckInterval *time.Duration `mapstructure:"check_interval"`
RepositoryURL string `mapstructure:"repository_url"` RepositoryURL *string `mapstructure:"repository_url"`
WantedVersion string `mapstructure:"wanted_version"` WantedVersion *string `mapstructure:"wanted_version"`
} }
type Log struct { type Log struct {
Level string `mapstructure:"level"` Level *string `mapstructure:"level"`
OutPath string `mapstructure:"out_path"` OutPath *string `mapstructure:"out_path"`
} }
// ConfigEnv structure for environment variables // ConfigEnv structure for environment variables
type Env struct { type Env struct {
ConfigPath string `mapstructure:"config_path"` ConfigPath *string `mapstructure:"config_path"`
NodePath string `mapstructure:"node_path"` NodePath *string `mapstructure:"node_path"`
ParentStagePID int `mapstructure:"parent_pid"` ParentStagePID *int `mapstructure:"parent_pid"`
} }
type CMDLine struct { type CMDLine struct {

12
internal/server/sv1/lua_handler.go
View File

@@ -12,8 +12,6 @@ import (
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
) )
func (h *HandlerV1) handleLUA(path string, req *rpc.RPCRequest) *rpc.RPCResponse { func (h *HandlerV1) handleLUA(path string, req *rpc.RPCRequest) *rpc.RPCResponse {
L := lua.NewState() L := lua.NewState()
defer L.Close() defer L.Close()
@@ -36,10 +34,10 @@ func (h *HandlerV1) handleLUA(path string, req *rpc.RPCRequest) *rpc.RPCResponse
logTable := L.NewTable() logTable := L.NewTable()
logFuncs := map[string]func(string, ...any){ logFuncs := map[string]func(string, ...any){
"Info": h.x.SLog.Info, "Info": h.x.SLog.Info,
"Debug": h.x.SLog.Debug, "Debug": h.x.SLog.Debug,
"Error": h.x.SLog.Error, "Error": h.x.SLog.Error,
"Warn": h.x.SLog.Warn, "Warn": h.x.SLog.Warn,
} }
for name, logFunc := range logFuncs { for name, logFunc := range logFuncs {
@@ -70,7 +68,7 @@ func (h *HandlerV1) handleLUA(path string, req *rpc.RPCRequest) *rpc.RPCResponse
L.SetGlobal("Log", logTable) L.SetGlobal("Log", logTable)
prep := filepath.Join(h.x.Config.Conf.ComDir, "_prepare.lua") prep := filepath.Join(*h.x.Config.Conf.ComDir, "_prepare.lua")
if _, err := os.Stat(prep); err == nil { if _, err := os.Stat(prep); err == nil {
if err := L.DoFile(prep); err != nil { if err := L.DoFile(prep); err != nil {
return rpc.NewError(rpc.ErrInternalError, err.Error(), req.ID) return rpc.NewError(rpc.ErrInternalError, err.Error(), req.ID)

2
internal/server/sv1/path.go
View File

@@ -16,7 +16,7 @@ func (h *HandlerV1) resolveMethodPath(method string) (string, error) {
parts := strings.Split(method, ">") parts := strings.Split(method, ">")
relPath := filepath.Join(parts...) + ".lua" relPath := filepath.Join(parts...) + ".lua"
fullPath := filepath.Join(h.x.Config.Conf.ComDir, relPath) fullPath := filepath.Join(*h.x.Config.Conf.ComDir, relPath)
if _, err := os.Stat(fullPath); os.IsNotExist(err) { if _, err := os.Stat(fullPath); os.IsNotExist(err) {
return "", errors.New(rpc.ErrMethodNotFoundS) return "", errors.New(rpc.ErrMethodNotFoundS)