rename cliaction to action in typiobj + tidy up

EXPERIMENTAL/typicmd/application/application.go

@@ -14,7 +14,6 @@ type application struct {
 
 func (a application) Run(ctx *cli.Context) (err error) {
  di := dig.New()
- defer a.Close(di)
  runkit.GracefulShutdown(func() error {
  return a.Close(di)
  })

EXPERIMENTAL/typiobj/cli.go → EXPERIMENTAL/typiobj/action.go

@@ -5,19 +5,8 @@ import (
  "go.uber.org/dig"
 )
 
-// CommandLiner responsible to give command
-type CommandLiner interface {
- CommandLine() cli.Command
-}
-
-// IsCommandLiner return true if object implementation of CommandLiner
-func IsCommandLiner(obj interface{}) (ok bool) {
- _, ok = obj.(CommandLiner)
- return
-}
-
-// CliAction to return cli action
-func CliAction(p interface{}, fn interface{}) func(ctx *cli.Context) error {
+// Action to return cli action
+func Action(p interface{}, fn interface{}) func(ctx *cli.Context) error {
  return func(ctx *cli.Context) (err error) {
  c := dig.New()
  defer func() {

EXPERIMENTAL/typiobj/commandliner.go

@@ -0,0 +1,16 @@
+package typiobj
+
+import (
+ "github.com/urfave/cli"
+)
+
+// CommandLiner responsible to give command
+type CommandLiner interface {
+ CommandLine() cli.Command
+}
+
+// IsCommandLiner return true if object implementation of CommandLiner
+func IsCommandLiner(obj interface{}) (ok bool) {
+ _, ok = obj.(CommandLiner)
+ return
+}

pkg/typpostgres/module.go

@@ -48,12 +48,12 @@ func (p postgresModule) CommandLine() cli.Command {
  Usage: "Postgres Database Tool",
  Before: envkit.CliLoadEnvFile,
  Subcommands: []cli.Command{
- {Name: "create", Usage: "Create New Database", Action: typiobj.CliAction(p, p.createDB)},
- {Name: "drop", Usage: "Drop Database", Action: typiobj.CliAction(p, p.dropDB)},
- {Name: "migrate", Usage: "Migrate Database", Action: typiobj.CliAction(p, p.migrateDB)},
- {Name: "rollback", Usage: "Rollback Database", Action: typiobj.CliAction(p, p.rollbackDB)},
- {Name: "seed", Usage: "Database Seeding", Action: typiobj.CliAction(p, p.seedDB)},
- {Name: "console", Usage: "PostgreSQL interactive terminal", Action: typiobj.CliAction(p, p.console)},
+ {Name: "create", Usage: "Create New Database", Action: typiobj.Action(p, p.createDB)},
+ {Name: "drop", Usage: "Drop Database", Action: typiobj.Action(p, p.dropDB)},
+ {Name: "migrate", Usage: "Migrate Database", Action: typiobj.Action(p, p.migrateDB)},
+ {Name: "rollback", Usage: "Rollback Database", Action: typiobj.Action(p, p.rollbackDB)},
+ {Name: "seed", Usage: "Database Seeding", Action: typiobj.Action(p, p.seedDB)},
+ {Name: "console", Usage: "PostgreSQL interactive terminal", Action: typiobj.Action(p, p.console)},
  },
  }
 }
@@ -89,7 +89,7 @@ func (p postgresModule) openConnection(cfg *Config) (db *sql.DB, err error) {
 }
 
 func (postgresModule) closeConnection(db *sql.DB) error {
- log.Info("Close postgres connection")
+ fmt.Println("Close postgres connection")
  return db.Close()
 }
 

pkg/typredis/module.go

@@ -50,7 +50,7 @@ func (r redisModule) CommandLine() cli.Command {
  Usage: "Redis Utility Tool",
  Before: envkit.CliLoadEnvFile,
  Subcommands: []cli.Command{
- {Name: "console", ShortName: "c", Action: typiobj.CliAction(r, r.console)},
+ {Name: "console", ShortName: "c", Action: typiobj.Action(r, r.console)},
  },
  }
 }
@@ -79,6 +79,7 @@ func (redisModule) connect(cfg *Config) (client *redis.Client, err error) {
 }
 
 func (redisModule) disconnect(client *redis.Client) (err error) {
+ fmt.Println("Redis Client close")
  return client.Close()
 }
 

pkg/typserver/module.go

@@ -2,6 +2,7 @@ package typserver
 
 import (
  "context"
+ "fmt"
  "time"
 
  "github.com/kelseyhightower/envconfig"
@@ -68,7 +69,7 @@ func (s serverModule) Create(cfg *Config) *echo.Echo {
 
 // Shutdown the server
 func (s serverModule) Shutdown(server *echo.Echo) error {
- log.Info("Server is shutting down")
+ fmt.Println("Server is shutting down")
  ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
  defer cancel()
  return server.Shutdown(ctx)