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

rename init hooks names

Browse Source
This commit is contained in:
Alexey
2025-08-01 13:12:27 +03:00
parent 83912b6c28
commit 93cf53025c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hooks/initial.go
View File

@@ -30,7 +30,7 @@ import (
var Compositor *config.Compositor = config.NewCompositor() 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.Config = Compositor
x.Log.SetOutput(os.Stdout) x.Log.SetOutput(os.Stdout)
x.Log.SetPrefix(colors.SetBrightBlack(fmt.Sprintf("(%s) ", cs.Stage))) 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 // 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{ *cs = *corestate.NewCorestate(&corestate.CoreState{
UUID32DirName: "uuid", UUID32DirName: "uuid",
NodeBinName: filepath.Base(os.Args[0]), 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))) x.Log.SetPrefix(colors.SetYellow(fmt.Sprintf("(%s) ", cs.Stage)))
if err := x.Config.LoadEnv(); err != nil { 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")) uuid32, err := corestate.GetNodeUUID(filepath.Join(cs.MetaDir, "uuid"))
if errors.Is(err, fs.ErrNotExist) { if errors.Is(err, fs.ErrNotExist) {
if err := corestate.SetNodeUUID(filepath.Join(cs.NodePath, cs.MetaDir, cs.UUID32DirName)); err != nil { 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 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() { if *x.Config.Env.ParentStagePID != os.Getpid() {
// still pre-init stage // still pre-init stage
runDir, err := run_manager.Create(cs.UUID32) runDir, err := run_manager.Create(cs.UUID32)
@@ -133,7 +133,7 @@ func Init4Hook(_ context.Context, cs *corestate.CoreState, x *app.AppX) {
} }
// post-init stage // 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) { NodeApp.Fallback(func(ctx context.Context, cs *corestate.CoreState, x *app.AppX) {
x.Log.Println("Cleaning up...") 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" { 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") 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 { if *x.Config.Conf.Node.ShowConfig {
fmt.Printf("Configuration from %s:\n", x.Config.CMDLine.Run.ConfigPath) fmt.Printf("Configuration from %s:\n", x.Config.CMDLine.Run.ConfigPath)
x.Config.Print(x.Config.Conf) 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) 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 cs.Stage = corestate.StageReady
x.Log.SetPrefix(colors.SetGreen(fmt.Sprintf("(%s) ", cs.Stage))) 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) { func Run(cmd *cobra.Command, args []string) {
NodeApp.InitialHooks( NodeApp.InitialHooks(
Init0Hook, Init1Hook, Init2Hook, InitGlobalLoggerHook, InitCorestateHook, InitConfigLoadHook,
Init3Hook, Init4Hook, Init5Hook, InitUUUDHook, InitRuntimeHook, InitRunlockHook,
Init6Hook, Init7Hook, Init8Hook, InitConfigReplHook, InitConfigPrintHook, InitSLogHook,
) )
NodeApp.Run(RunHook) NodeApp.Run(RunHook)