replace fmt.Print statements with log.Print

pull/71/head
Jorrit Salverda 2017-09-05 14:43:32 +02:00
parent 02e9395c17
commit 17520f5188
8 changed files with 19 additions and 19 deletions

View File

@ -3,7 +3,6 @@ package main
import ( import (
"database/sql" "database/sql"
"flag" "flag"
"fmt"
"log" "log"
"os" "os"
@ -81,9 +80,9 @@ func main() {
} }
func usage() { func usage() {
fmt.Print(usagePrefix) log.Print(usagePrefix)
flags.PrintDefaults() flags.PrintDefaults()
fmt.Print(usageCommands) log.Print(usageCommands)
} }
var ( var (

View File

@ -3,6 +3,7 @@ package goose
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"log"
"os" "os"
"path/filepath" "path/filepath"
"text/template" "text/template"
@ -35,7 +36,7 @@ func Create(db *sql.DB, dir, name, migrationType string) error {
return err return err
} }
fmt.Printf("Created new file: %s\n", path) log.Printf("Created new file: %s\n", path)
return nil return nil
} }

View File

@ -3,6 +3,7 @@ package goose
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"log"
) )
// Down rolls back a single migration from the current version. // Down rolls back a single migration from the current version.
@ -40,12 +41,12 @@ func DownTo(db *sql.DB, dir string, version int64) error {
current, err := migrations.Current(currentVersion) current, err := migrations.Current(currentVersion)
if err != nil { if err != nil {
fmt.Printf("goose: no migrations to run. current version: %d\n", currentVersion) log.Printf("goose: no migrations to run. current version: %d\n", currentVersion)
return nil return nil
} }
if current.Version <= version { if current.Version <= version {
fmt.Printf("goose: no migrations to run. current version: %d\n", currentVersion) log.Printf("goose: no migrations to run. current version: %d\n", currentVersion)
return nil return nil
} }

View File

@ -3,7 +3,6 @@ package main
import ( import (
"database/sql" "database/sql"
"flag" "flag"
"fmt"
"log" "log"
"os" "os"
@ -81,9 +80,9 @@ func main() {
} }
func usage() { func usage() {
fmt.Print(usagePrefix) log.Print(usagePrefix)
flags.PrintDefaults() flags.PrintDefaults()
fmt.Print(usageCommands) log.Print(usageCommands)
} }
var ( var (

View File

@ -38,7 +38,7 @@ func (m *Migration) Up(db *sql.DB) error {
if err := m.run(db, true); err != nil { if err := m.run(db, true); err != nil {
return err return err
} }
fmt.Println("OK ", filepath.Base(m.Source)) log.Println("OK ", filepath.Base(m.Source))
return nil return nil
} }
@ -47,7 +47,7 @@ func (m *Migration) Down(db *sql.DB) error {
if err := m.run(db, false); err != nil { if err := m.run(db, false); err != nil {
return err return err
} }
fmt.Println("OK ", filepath.Base(m.Source)) log.Println("OK ", filepath.Base(m.Source))
return nil return nil
} }

View File

@ -21,8 +21,8 @@ func Status(db *sql.DB, dir string) error {
return err return err
} }
fmt.Println(" Applied At Migration") log.Println(" Applied At Migration")
fmt.Println(" =======================================") log.Println(" =======================================")
for _, migration := range migrations { for _, migration := range migrations {
printMigrationStatus(db, migration.Version, filepath.Base(migration.Source)) printMigrationStatus(db, migration.Version, filepath.Base(migration.Source))
} }
@ -47,5 +47,5 @@ func printMigrationStatus(db *sql.DB, version int64, script string) {
appliedAt = "Pending" appliedAt = "Pending"
} }
fmt.Printf(" %-24s -- %v\n", appliedAt, script) log.Printf(" %-24s -- %v\n", appliedAt, script)
} }

6
up.go
View File

@ -2,7 +2,7 @@ package goose
import ( import (
"database/sql" "database/sql"
"fmt" "log"
) )
// UpTo migrates up to a specific version. // UpTo migrates up to a specific version.
@ -21,7 +21,7 @@ func UpTo(db *sql.DB, dir string, version int64) error {
next, err := migrations.Next(current) next, err := migrations.Next(current)
if err != nil { if err != nil {
if err == ErrNoNextVersion { if err == ErrNoNextVersion {
fmt.Printf("goose: no migrations to run. current version: %d\n", current) log.Printf("goose: no migrations to run. current version: %d\n", current)
return nil return nil
} }
return err return err
@ -53,7 +53,7 @@ func UpByOne(db *sql.DB, dir string) error {
next, err := migrations.Next(currentVersion) next, err := migrations.Next(currentVersion)
if err != nil { if err != nil {
if err == ErrNoNextVersion { if err == ErrNoNextVersion {
fmt.Printf("goose: no migrations to run. current version: %d\n", currentVersion) log.Printf("goose: no migrations to run. current version: %d\n", currentVersion)
} }
return err return err
} }

View File

@ -2,7 +2,7 @@ package goose
import ( import (
"database/sql" "database/sql"
"fmt" "log"
) )
// Version prints the current version of the database. // Version prints the current version of the database.
@ -12,6 +12,6 @@ func Version(db *sql.DB, dir string) error {
return err return err
} }
fmt.Printf("goose: version %v\n", current) log.Printf("goose: version %v\n", current)
return nil return nil
} }