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

add new initialization hook to check configuration

Browse Source
This commit is contained in:
Alexey
2025-07-30 19:19:27 +03:00
parent 23ed707029
commit f44e89b0de
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hooks/run.go
View File

@@ -31,7 +31,7 @@ func Run(cmd *cobra.Command, args []string) {
nodeApp.InitialHooks( nodeApp.InitialHooks(
Init0Hook, Init1Hook, Init2Hook, Init0Hook, Init1Hook, Init2Hook,
Init3Hook, Init4Hook, Init5Hook, Init3Hook, Init4Hook, Init5Hook,
Init6Hook, Init6Hook, Init7Hook,
) )
nodeApp.Run(RunHook) nodeApp.Run(RunHook)
@@ -82,7 +82,7 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
}) })
srv := &http.Server{ srv := &http.Server{
Addr: x.Config.Conf.HTTPServer.Address, Addr: *x.Config.Conf.HTTPServer.Address,
Handler: r, Handler: r,
ErrorLog: log.New(&logs.SlogWriter{ ErrorLog: log.New(&logs.SlogWriter{
Logger: x.SLog, Logger: x.SLog,
@@ -107,22 +107,22 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
go func() { go func() {
defer utils.CatchPanicWithCancel(cancelMain) defer utils.CatchPanicWithCancel(cancelMain)
if x.Config.Conf.TLS.TlsEnabled { if *x.Config.Conf.TLS.TlsEnabled {
listener, err := net.Listen("tcp", fmt.Sprintf("%s:%s", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port)) listener, err := net.Listen("tcp", fmt.Sprintf("%s:%s", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port))
if err != nil { if err != nil {
x.Log.Printf("%s: Failed to start TLS listener: %s", logs.PrintError(), err.Error()) x.Log.Printf("%s: Failed to start TLS listener: %s", logs.PrintError(), err.Error())
cancelMain() cancelMain()
return return
} }
x.Log.Printf("Serving on %s port %s with TLS... (https://%s%s)", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port, fmt.Sprintf("%s:%s", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port), config.ComDirRoute) x.Log.Printf("Serving on %s port %s with TLS... (https://%s%s)", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port, fmt.Sprintf("%s:%s", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port), config.ComDirRoute)
limitedListener := netutil.LimitListener(listener, 100) limitedListener := netutil.LimitListener(listener, 100)
if err := srv.ServeTLS(limitedListener, x.Config.Conf.TLS.CertFile, x.Config.Conf.TLS.KeyFile); err != nil && !errors.Is(err, http.ErrServerClosed) { if err := srv.ServeTLS(limitedListener, *x.Config.Conf.TLS.CertFile, *x.Config.Conf.TLS.KeyFile); err != nil && !errors.Is(err, http.ErrServerClosed) {
x.Log.Printf("%s: Failed to start HTTPS server: %s", logs.PrintError(), err.Error()) x.Log.Printf("%s: Failed to start HTTPS server: %s", logs.PrintError(), err.Error())
cancelMain() cancelMain()
} }
} else { } else {
x.Log.Printf("Serving on %s port %s... (http://%s%s)", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port, fmt.Sprintf("%s:%s", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port), config.ComDirRoute) x.Log.Printf("Serving on %s port %s... (http://%s%s)", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port, fmt.Sprintf("%s:%s", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port), config.ComDirRoute)
listener, err := net.Listen("tcp", fmt.Sprintf("%s:%s", x.Config.Conf.HTTPServer.Address, x.Config.Conf.HTTPServer.Port)) listener, err := net.Listen("tcp", fmt.Sprintf("%s:%s", *x.Config.Conf.HTTPServer.Address, *x.Config.Conf.HTTPServer.Port))
if err != nil { if err != nil {
x.Log.Printf("%s: Failed to start listener: %s", logs.PrintError(), err.Error()) x.Log.Printf("%s: Failed to start listener: %s", logs.PrintError(), err.Error())
cancelMain() cancelMain()
@@ -136,7 +136,7 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
} }
}() }()
if x.Config.Conf.Updates.UpdatesEnabled { if *x.Config.Conf.Updates.UpdatesEnabled {
go func() { go func() {
defer utils.CatchPanicWithCancel(cancelMain) defer utils.CatchPanicWithCancel(cancelMain)
updated := update.NewUpdater(&update.UpdaterInit{ updated := update.NewUpdater(&update.UpdaterInit{
@@ -157,7 +157,7 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
x.Log.Printf("Update completed successfully") x.Log.Printf("Update completed successfully")
} }
} }
time.Sleep(x.Config.Conf.Updates.CheckInterval) time.Sleep(*x.Config.Conf.Updates.CheckInterval)
} }
}() }()
} }