mirror of
https://github.com/beego/bee.git
synced 2024-12-27 08:10:59 +00:00
Merge pull request #49 from ZhengYang/master
Fix color log '#' issue and change remove temp file err to warning
This commit is contained in:
commit
2c6fbbb7ff
12
migrate.go
12
migrate.go
@ -16,6 +16,7 @@ package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
@ -300,10 +301,9 @@ func changeDir(dir string) {
|
||||
|
||||
// removeTempFile removes a file in dir
|
||||
func removeTempFile(dir, file string) {
|
||||
os.Chdir(dir)
|
||||
changeDir(dir)
|
||||
if err := os.Remove(file); err != nil {
|
||||
ColorLog("[ERRO] Could not remove temporary migration files: %s\n", err)
|
||||
os.Exit(2)
|
||||
ColorLog("[WARN] Could not remove temporary file: %s\n", err)
|
||||
}
|
||||
}
|
||||
|
||||
@ -311,7 +311,8 @@ func removeTempFile(dir, file string) {
|
||||
func formatShellErrOutput(o string) {
|
||||
for _, line := range strings.Split(o, "\n") {
|
||||
if line != "" {
|
||||
ColorLog("[ERRO] -| %s\n", line)
|
||||
ColorLog("[ERRO] -| ")
|
||||
fmt.Println(line)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -320,7 +321,8 @@ func formatShellErrOutput(o string) {
|
||||
func formatShellOutput(o string) {
|
||||
for _, line := range strings.Split(o, "\n") {
|
||||
if line != "" {
|
||||
ColorLog("[INFO] -| %s\n", line)
|
||||
ColorLog("[INFO] -| ")
|
||||
fmt.Println(line)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user