diff options
author | zeripath <art27@cantab.net> | 2019-04-02 08:48:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 08:48:31 +0100 |
commit | 704da08fdc6bae6fdd6bf1b892ebe12afeef5eca (patch) | |
tree | e0613ab3ba0d4336b0912bbad8862f503ec180f6 /modules/indexer | |
parent | ef2a343e27d8af2de0bb696bd60d9a019e1e8b69 (diff) | |
download | gitea-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 'modules/indexer')
-rw-r--r-- | modules/indexer/issues/indexer.go | 8 | ||||
-rw-r--r-- | modules/indexer/issues/queue_disk.go | 8 | ||||
-rw-r--r-- | modules/indexer/repo.go | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 4d7e64adc7..3d066ca3fa 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -116,7 +116,7 @@ func populateIssueIndexer() { Collaborate: util.OptionalBoolFalse, }) if err != nil { - log.Error(4, "SearchRepositoryByName: %v", err) + log.Error("SearchRepositoryByName: %v", err) continue } if len(repos) == 0 { @@ -130,11 +130,11 @@ func populateIssueIndexer() { IsPull: util.OptionalBoolNone, }) if err != nil { - log.Error(4, "Issues: %v", err) + log.Error("Issues: %v", err) continue } if err = models.IssueList(is).LoadDiscussComments(); err != nil { - log.Error(4, "LoadComments: %v", err) + log.Error("LoadComments: %v", err) continue } for _, issue := range is { @@ -166,7 +166,7 @@ func DeleteRepoIssueIndexer(repo *models.Repository) { var ids []int64 ids, err := models.GetIssueIDsByRepoID(repo.ID) if err != nil { - log.Error(4, "getIssueIDsByRepoID failed: %v", err) + log.Error("getIssueIDsByRepoID failed: %v", err) return } diff --git a/modules/indexer/issues/queue_disk.go b/modules/indexer/issues/queue_disk.go index be6867f9ca..cf9e6aee22 100644 --- a/modules/indexer/issues/queue_disk.go +++ b/modules/indexer/issues/queue_disk.go @@ -53,7 +53,7 @@ func (l *LevelQueue) Run() error { bs, err := l.queue.RPop() if err != nil { if err != levelqueue.ErrNotFound { - log.Error(4, "RPop: %v", err) + log.Error("RPop: %v", err) } time.Sleep(time.Millisecond * 100) continue @@ -67,7 +67,7 @@ func (l *LevelQueue) Run() error { var data IndexerData err = json.Unmarshal(bs, &data) if err != nil { - log.Error(4, "Unmarshal: %v", err) + log.Error("Unmarshal: %v", err) time.Sleep(time.Millisecond * 100) continue } @@ -77,11 +77,11 @@ func (l *LevelQueue) Run() error { if data.IsDelete { if data.ID > 0 { if err = l.indexer.Delete(data.ID); err != nil { - log.Error(4, "indexer.Delete: %v", err) + log.Error("indexer.Delete: %v", err) } } else if len(data.IDs) > 0 { if err = l.indexer.Delete(data.IDs...); err != nil { - log.Error(4, "indexer.Delete: %v", err) + log.Error("indexer.Delete: %v", err) } } time.Sleep(time.Millisecond * 10) diff --git a/modules/indexer/repo.go b/modules/indexer/repo.go index 20e0fa6b18..287d23854b 100644 --- a/modules/indexer/repo.go +++ b/modules/indexer/repo.go @@ -68,7 +68,7 @@ func (update RepoIndexerUpdate) AddToFlushingBatch(batch rupture.FlushingBatch) case RepoIndexerOpDelete: return batch.Delete(id) default: - log.Error(4, "Unrecognized repo indexer op: %d", update.Op) + log.Error("Unrecognized repo indexer op: %d", update.Op) } return nil } @@ -78,17 +78,17 @@ func InitRepoIndexer(populateIndexer func() error) { var err error repoIndexer, err = openIndexer(setting.Indexer.RepoPath, repoIndexerLatestVersion) if err != nil { - log.Fatal(4, "InitRepoIndexer: %v", err) + log.Fatal("InitRepoIndexer: %v", err) } if repoIndexer != nil { return } if err = createRepoIndexer(setting.Indexer.RepoPath, repoIndexerLatestVersion); err != nil { - log.Fatal(4, "CreateRepoIndexer: %v", err) + log.Fatal("CreateRepoIndexer: %v", err) } if err = populateIndexer(); err != nil { - log.Fatal(4, "PopulateRepoIndex: %v", err) + log.Fatal("PopulateRepoIndex: %v", err) } } @@ -135,7 +135,7 @@ func filenameIndexerID(repoID int64, filename string) string { func filenameOfIndexerID(indexerID string) string { index := strings.IndexByte(indexerID, '_') if index == -1 { - log.Error(4, "Unexpected ID in repo indexer: %s", indexerID) + log.Error("Unexpected ID in repo indexer: %s", indexerID) } return indexerID[index+1:] } |