aboutsummaryrefslogtreecommitdiffstats
path: root/models/migrations
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-04-02 08:48:31 +0100
committerGitHub <noreply@github.com>2019-04-02 08:48:31 +0100
commit704da08fdc6bae6fdd6bf1b892ebe12afeef5eca (patch)
treee0613ab3ba0d4336b0912bbad8862f503ec180f6 /models/migrations
parentef2a343e27d8af2de0bb696bd60d9a019e1e8b69 (diff)
downloadgitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.tar.gz
gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.zip
Better logging (#6038) (#6095)
* Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
Diffstat (limited to 'models/migrations')
-rw-r--r--models/migrations/migrations.go4
-rw-r--r--models/migrations/v33.go2
-rw-r--r--models/migrations/v45.go2
-rw-r--r--models/migrations/v50.go2
-rw-r--r--models/migrations/v61.go2
5 files changed, 6 insertions, 6 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 2807de78b1..fda37f8da8 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -244,7 +244,7 @@ func Migrate(x *xorm.Engine) error {
v := currentVersion.Version
if minDBVersion > v {
- log.Fatal(4, `Gitea no longer supports auto-migration from your previously installed version.
+ log.Fatal(`Gitea no longer supports auto-migration from your previously installed version.
Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to current version.`)
return nil
}
@@ -315,7 +315,7 @@ func dropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin
return sess.Commit()
default:
- log.Fatal(4, "Unrecognized DB")
+ log.Fatal("Unrecognized DB")
}
return nil
diff --git a/models/migrations/v33.go b/models/migrations/v33.go
index 26cce0b3c7..ae7612e68c 100644
--- a/models/migrations/v33.go
+++ b/models/migrations/v33.go
@@ -26,7 +26,7 @@ func removeActionColumns(x *xorm.Engine) error {
return fmt.Errorf("DROP COLUMN repo_name: %v", err)
}
default:
- log.Fatal(4, "Unrecognized DB")
+ log.Fatal("Unrecognized DB")
}
return nil
}
diff --git a/models/migrations/v45.go b/models/migrations/v45.go
index 9ad27cf6db..92cb817819 100644
--- a/models/migrations/v45.go
+++ b/models/migrations/v45.go
@@ -21,7 +21,7 @@ func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) {
log.Warn("DROP COLUMN index: %v", err)
}
default:
- log.Fatal(4, "Unrecognized DB")
+ log.Fatal("Unrecognized DB")
}
return nil
diff --git a/models/migrations/v50.go b/models/migrations/v50.go
index 4ed8f05157..a15914f0ee 100644
--- a/models/migrations/v50.go
+++ b/models/migrations/v50.go
@@ -48,7 +48,7 @@ func migrateProtectedBranchStruct(x *xorm.Engine) error {
log.Warn("DROP COLUMN can_push (skipping): %v", err)
}
default:
- log.Fatal(4, "Unrecognized DB")
+ log.Fatal("Unrecognized DB")
}
return nil
diff --git a/models/migrations/v61.go b/models/migrations/v61.go
index bcbc7553b8..8d9b7e2d23 100644
--- a/models/migrations/v61.go
+++ b/models/migrations/v61.go
@@ -33,7 +33,7 @@ func addSizeToAttachment(x *xorm.Engine) error {
localPath := path.Join(setting.AttachmentPath, attach.UUID[0:1], attach.UUID[1:2], attach.UUID)
fi, err := os.Stat(localPath)
if err != nil {
- log.Error(4, "calculate file size of attachment[UUID: %s]: %v", attach.UUID, err)
+ log.Error("calculate file size of attachment[UUID: %s]: %v", attach.UUID, err)
continue
}
attach.Size = fi.Size()