create runner to run task in application

EXPERIMENTAL/typicmd/application/run.go

@@ -17,7 +17,7 @@ func Run(c *typictx.Context) {
  app.Usage = ""
  app.Description = c.Description
  app.Version = c.Version
- app.Action = typictx.ActionCommandFunction(c, c.Application)
+ app.Action = action(c, c.StartFunc)
  app.Before = func(ctx *cli.Context) error {
  return typienv.LoadEnvFile()
  }
@@ -26,11 +26,19 @@ func Run(c *typictx.Context) {
  Name: cmd.Name,
  ShortName: cmd.ShortName,
  Usage: cmd.Usage,
- Action: cmd.ActionFunc.CommandFunction(c),
+ Action: action(c, cmd.ActionFunc),
  })
  }
  err := app.Run(os.Args)
  if err != nil {
  log.Fatal(err.Error())
  }
 }
+
+// ActionCommandFunction to get command function fo action
+func action(ctx *typictx.Context, action interface{}) interface{} {
+ return runner{
+ Context: ctx,
+ action: action,
+ }.Run
+}

EXPERIMENTAL/typicmd/application/runner.go

@@ -0,0 +1,44 @@
+package application
+
+import (
+ "os"
+ "os/signal"
+ "syscall"
+
+ log "github.com/sirupsen/logrus"
+ "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typictx"
+ "github.com/urfave/cli"
+ "go.uber.org/dig"
+)
+
+type runner struct {
+ *typictx.Context
+ action interface{}
+}
+
+func (a runner) Run(ctx *cli.Context) (err error) {
+ log.Info("------------- Application Start -------------")
+ defer log.Info("-------------- Application End --------------")
+ gracefulStop := make(chan os.Signal)
+ signal.Notify(gracefulStop, syscall.SIGTERM)
+ signal.Notify(gracefulStop, syscall.SIGINT)
+ di := dig.New()
+ if err = a.Construct(di); err != nil {
+ return
+ }
+ // TODO: create prepare function
+ for _, initiation := range a.Initiations {
+ if err = di.Invoke(initiation); err != nil {
+ return
+ }
+ }
+ go func() { // gracefull shutdown
+ <-gracefulStop
+ log.Println("\nGraceful Shutdown...")
+ err = a.Destruct(di)
+ }()
+ if err = di.Invoke(a.action); err != nil {
+ return
+ }
+ return
+}

EXPERIMENTAL/typictx/action.go

@@ -14,13 +14,3 @@ type ActionContext struct {
  *Context
  Cli *cli.Context
 }
-
-// ActionCommandFunction to get command function fo action
-func ActionCommandFunction(context *Context, action Action) interface{} {
- return func(ctx *cli.Context) error {
- return action.Start(&ActionContext{
- Cli: ctx,
- Context: context,
- })
- }
-}

EXPERIMENTAL/typictx/application.go

@@ -1,14 +1,5 @@
 package typictx
 
-import (
- "fmt"
- "os"
- "os/signal"
- "syscall"
-
- log "github.com/sirupsen/logrus"
-)
-
 // Application is represent the application
 type Application struct {
  Config Config
@@ -18,30 +9,6 @@ type Application struct {
  Initiations []interface{}
 }
 
-// Start the action
-func (a Application) Start(ctx *ActionContext) (err error) {
- log.Info("------------- Application Start -------------")
- defer log.Info("-------------- Application End --------------")
- gracefulStop := make(chan os.Signal)
- signal.Notify(gracefulStop, syscall.SIGTERM)
- signal.Notify(gracefulStop, syscall.SIGINT)
- for _, initiation := range a.Initiations {
- if err = ctx.Invoke(initiation); err != nil {
- return
- }
- }
- go func() { // gracefull shutdown
- <-gracefulStop
- fmt.Println() // NOTE: intentionally print new line after "^C"
- fmt.Println("Graceful Shutdown...")
- err = ctx.Destruct(ctx.Container)
- }()
- if a.StartFunc != nil {
- err = ctx.Invoke(a.StartFunc)
- }
- return
-}
-
 // Configure return configuration
 func (a Application) Configure() Config {
  return a.Config