lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-29 11:41:28 +00:00
Code Issues Releases Activity

Merge pull request #49 from ZhengYang/master

Browse Source 
Fix color log '#' issue and change remove temp file err to warning
This commit is contained in:
astaxie 2014-08-14 14:44:49 +08:00
commit 2c6fbbb7ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migrate.go
View File

@ -16,6 +16,7 @@ package main
import ( import (
"database/sql" "database/sql"
"fmt"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -300,10 +301,9 @@ func changeDir(dir string) {
// removeTempFile removes a file in dir // removeTempFile removes a file in dir
func removeTempFile(dir, file string) { func removeTempFile(dir, file string) {
os.Chdir(dir) changeDir(dir)
if err := os.Remove(file); err != nil { if err := os.Remove(file); err != nil {
ColorLog("[ERRO] Could not remove temporary migration files: %s\n", err) ColorLog("[WARN] Could not remove temporary file: %s\n", err)
os.Exit(2)
} }
} }
@ -311,7 +311,8 @@ func removeTempFile(dir, file string) {
func formatShellErrOutput(o string) { func formatShellErrOutput(o string) {
for _, line := range strings.Split(o, "\n") { for _, line := range strings.Split(o, "\n") {
if line != "" { if line != "" {
ColorLog("[ERRO] -| %s\n", line) ColorLog("[ERRO] -| ")
fmt.Println(line)
} }
} }
} }
@ -320,7 +321,8 @@ func formatShellErrOutput(o string) {
func formatShellOutput(o string) { func formatShellOutput(o string) {
for _, line := range strings.Split(o, "\n") { for _, line := range strings.Split(o, "\n") {
if line != "" { if line != "" {
ColorLog("[INFO] -| %s\n", line) ColorLog("[INFO] -| ")
fmt.Println(line)
} }
} }
} }