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

Compare commits

base: alex:83912b6c284b515e829a23723a6775d75ee60114
Branches Tags
alex:main alex:auth-server alex:dev
alex:v0.0.1-dev
...
compare: alex:6508f03d085f07016d255d7de6f3ea796a34278e
Branches Tags
alex:main alex:auth-server alex:dev
alex:v0.0.1-dev

2 Commits
83912b6c28 ... 6508f03d08

Author SHA1 Message Date
Alexey
6508f03d08 fmt 2025-08-01 13:12:57 +03:00
Alexey
93cf53025c rename init hooks names 2025-08-01 13:12:27 +03:00
3 changed files with 13 additions and 13 deletions
Expand all files Collapse all files

18
hooks/initial.go
View File

@@ -30,7 +30,7 @@ import (
var Compositor *config.Compositor = config.NewCompositor()
func Init0Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitGlobalLoggerHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
x.Config = Compositor
x.Log.SetOutput(os.Stdout)
x.Log.SetPrefix(colors.SetBrightBlack(fmt.Sprintf("(%s) ", cs.Stage)))
@@ -38,7 +38,7 @@ func Init0Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
}
// First stage: pre-init
func Init1Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitCorestateHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
*cs = *corestate.NewCorestate(&corestate.CoreState{
UUID32DirName: "uuid",
NodeBinName: filepath.Base(os.Args[0]),
@@ -49,7 +49,7 @@ func Init1Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
})
}
func Init2Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitConfigLoadHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
x.Log.SetPrefix(colors.SetYellow(fmt.Sprintf("(%s) ", cs.Stage)))
if err := x.Config.LoadEnv(); err != nil {
@@ -65,7 +65,7 @@ func Init2Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
}
}
func Init3Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitUUUDHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
uuid32, err := corestate.GetNodeUUID(filepath.Join(cs.MetaDir, "uuid"))
if errors.Is(err, fs.ErrNotExist) {
if err := corestate.SetNodeUUID(filepath.Join(cs.NodePath, cs.MetaDir, cs.UUID32DirName)); err != nil {
@@ -82,7 +82,7 @@ func Init3Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
cs.UUID32 = uuid32
}
func Init4Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitRuntimeHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
if *x.Config.Env.ParentStagePID != os.Getpid() {
// still pre-init stage
runDir, err := run_manager.Create(cs.UUID32)
@@ -133,7 +133,7 @@ func Init4Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
}
// post-init stage
func Init5Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitRunlockHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
NodeApp.Fallback(func(ctx context.Context, cs *corestate.CoreState, x *app.AppX) {
x.Log.Println("Cleaning up...")
@@ -185,7 +185,7 @@ func Init5Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
}
}
func Init6Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitConfigReplHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
if !slices.Contains(*x.Config.Conf.DisableWarnings, "--WNonStdTmpDir") && os.TempDir() != "/tmp" {
x.Log.Printf("%s: %s", colors.PrintWarn(), "Non-standard value specified for temporary directory")
}
@@ -207,7 +207,7 @@ func Init6Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
}
}
func Init7Hook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitConfigPrintHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) {
if *x.Config.Conf.Node.ShowConfig {
fmt.Printf("Configuration from %s:\n", x.Config.CMDLine.Run.ConfigPath)
x.Config.Print(x.Config.Conf)
@@ -224,7 +224,7 @@ func Init7Hook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) {
x.Log.Printf("Starting \"%s\" node", *x.Config.Conf.Node.Name)
}
func Init8Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
func InitSLogHook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
cs.Stage = corestate.StageReady
x.Log.SetPrefix(colors.SetGreen(fmt.Sprintf("(%s) ", cs.Stage)))

6
hooks/run.go
View File

@@ -32,9 +32,9 @@ var NodeApp = app.New()
func Run(cmd *cobra.Command, args []string) {
NodeApp.InitialHooks(
Init0Hook, Init1Hook, Init2Hook,
Init3Hook, Init4Hook, Init5Hook,
Init6Hook, Init7Hook, Init8Hook,
InitGlobalLoggerHook, InitCorestateHook, InitConfigLoadHook,
InitUUUDHook, InitRuntimeHook, InitRunlockHook,
InitConfigReplHook, InitConfigPrintHook, InitSLogHook,
)
NodeApp.Run(RunHook)

2
internal/engine/logs/logger.go
View File

@@ -58,7 +58,7 @@ func SetupLogger(o *config.Log) (*slog.Logger, error) {
handlerOpts.Level = slog.LevelInfo
}
switch o.OutPath{
switch o.OutPath {
case 1:
writer = os.Stdout
case 2: