Refactor code

This commit is contained in:
Andrey Chervyakov 2021-03-15 21:58:39 +06:00
parent 4c3f095109
commit db6f98ba79
3 changed files with 17 additions and 26 deletions

View file

@ -3,20 +3,26 @@ package main
import (
"cgnolink"
"cgnolink/database"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"os"
"time"
)
func main() {
cgnolink.ConfigureLogger()
configureLogger()
conf := cgnolink.NewConfig()
pool := database.Pool(conf)
if err := cgnolink.Migrate(pool); err != nil {
panic(err)
}
database.Migrate(pool)
server := cgnolink.NewServer(conf, pool)
server.Logger.Fatal(server.Start(":8080"))
}
func configureLogger() {
zerolog.TimeFieldFormat = time.RFC3339Nano
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
}

View file

@ -1,4 +1,4 @@
package cgnolink
package database
import (
"context"
@ -6,24 +6,22 @@ import (
"github.com/jackc/tern/migrate"
)
func Migrate(pool *pgxpool.Pool) error {
func Migrate(pool *pgxpool.Pool) {
conn, err := pool.Acquire(context.Background())
if err != nil {
return err
panic(err)
}
migrator, err := migrate.NewMigrator(context.Background(), conn.Conn(), "schema_version")
if err != nil {
return err
panic(err)
}
if err = migrator.LoadMigrations("./migrations"); err != nil {
return err
panic(err)
}
if err = migrator.Migrate(context.Background()); err != nil {
return err
panic(err)
}
return nil
}

View file

@ -1,13 +0,0 @@
package cgnolink
import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"os"
"time"
)
func ConfigureLogger() {
zerolog.TimeFieldFormat = time.RFC3339Nano
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
}