diff --git a/cmd/cgnolink/main.go b/cmd/cgnolink/main.go index 8bf4187..70635f9 100644 --- a/cmd/cgnolink/main.go +++ b/cmd/cgnolink/main.go @@ -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}) +} diff --git a/migrate.go b/database/migrate.go similarity index 76% rename from migrate.go rename to database/migrate.go index 4f62eea..4223e4a 100644 --- a/migrate.go +++ b/database/migrate.go @@ -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 } diff --git a/logger.go b/logger.go deleted file mode 100644 index 97a85f7..0000000 --- a/logger.go +++ /dev/null @@ -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}) -}