diff options
author | Meaglith Ma <genedna@gmail.com> | 2014-04-06 17:28:33 +0800 |
---|---|---|
committer | Meaglith Ma <genedna@gmail.com> | 2014-04-06 17:28:33 +0800 |
commit | 2e8d5c2eb36b63468dc78561566975c72eeaaefa (patch) | |
tree | 92659a09ec784005c8d9a0540e5197a75b0a3ea9 /models/models.go | |
parent | a044c24c3db4b18b20406045b40e55ce15f941a0 (diff) | |
parent | ef6b9784962d3152d3ec46833303bad72915af57 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'models/models.go')
-rw-r--r-- | models/models.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/models/models.go b/models/models.go index 384f1fc4..0ad86337 100644 --- a/models/models.go +++ b/models/models.go @@ -53,10 +53,10 @@ func NewTestEngine(x *xorm.Engine) (err error) { // os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm) // x, err = xorm.NewEngine("sqlite3", DbCfg.Path) default: - return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type) + return fmt.Errorf("Unknown database type: %s", DbCfg.Type) } if err != nil { - return fmt.Errorf("models.init(fail to conntect database): %v\n", err) + return fmt.Errorf("models.init(fail to conntect database): %v", err) } return x.Sync(new(User), new(PublicKey), new(Repository), new(Watch), @@ -75,10 +75,10 @@ func SetEngine() (err error) { os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm) orm, err = xorm.NewEngine("sqlite3", DbCfg.Path) default: - return fmt.Errorf("Unknown database type: %s\n", DbCfg.Type) + return fmt.Errorf("Unknown database type: %s", DbCfg.Type) } if err != nil { - return fmt.Errorf("models.init(fail to conntect database): %v\n", err) + return fmt.Errorf("models.init(fail to conntect database): %v", err) } // WARNNING: for serv command, MUST remove the output to os.stdout, @@ -89,7 +89,7 @@ func SetEngine() (err error) { f, err := os.Create(logPath) if err != nil { - return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err) + return fmt.Errorf("models.init(fail to create xorm.log): %v", err) } orm.Logger = f @@ -104,7 +104,7 @@ func NewEngine() (err error) { return err } else if err = orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch), new(Action), new(Access), new(Issue), new(Comment)); err != nil { - return fmt.Errorf("sync database struct error: %v\n", err) + return fmt.Errorf("sync database struct error: %v", err) } return nil } |