diff --git a/main.go b/main.go index fc87094..bd8414f 100644 --- a/main.go +++ b/main.go @@ -40,24 +40,24 @@ func (appArgs) Version() string { func main() { arg.MustParse(&args) - connect, err := db.Connect() - if err != nil { - appLog.Global.Get(appLog.SYSTEM).Error(fmt.Sprintf("Startup server error, failed connect to database: %v", err)) - return - } - - db.SetGlobal(connect) - appLog.Global.Get(appLog.SYSTEM).Info("Run db migration") - if err = runMigrate(); err != nil { - appLog.Global.Get(appLog.SYSTEM).Error(fmt.Sprintf("Migration failed, error: %v", err)) - return - } - if args.Server != nil { + connect, err := db.Connect() + if err != nil { + appLog.Global.Get(appLog.SYSTEM).Error(fmt.Sprintf("Startup server error, failed connect to database: %v", err)) + return + } + + db.SetGlobal(connect) + appLog.Global.Get(appLog.SYSTEM).Info("Run db migration") + if err = runMigrate(); err != nil { + appLog.Global.Get(appLog.SYSTEM).Error(fmt.Sprintf("Migration failed, error: %v", err)) + return + } + appLog.Global.Put(appLog.SERVER, logrus.New()) appLog.Global.Get(appLog.SERVER).Info("Startup server on port: ", args.Server.Port) - err := http.ListenAndServe(fmt.Sprintf(":%s", args.Server.Port), router.InitRoutes()) + err = http.ListenAndServe(fmt.Sprintf(":%s", args.Server.Port), router.InitRoutes()) if err != nil { appLog.Global.Get(appLog.SERVER).Error(fmt.Sprintf("Startup server error: %v", err)) }