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 /models/repo_mirror.go | |
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 'models/repo_mirror.go')
-rw-r--r-- | models/repo_mirror.go | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/models/repo_mirror.go b/models/repo_mirror.go index c3fc9a43db..759241e461 100644 --- a/models/repo_mirror.go +++ b/models/repo_mirror.go @@ -57,7 +57,7 @@ func (m *Mirror) AfterLoad(session *xorm.Session) { var err error m.Repo, err = getRepositoryByID(session, m.RepoID) if err != nil { - log.Error(3, "getRepositoryByID[%d]: %v", m.ID, err) + log.Error("getRepositoryByID[%d]: %v", m.ID, err) } } @@ -85,7 +85,7 @@ func (m *Mirror) readAddress() { var err error m.address, err = remoteAddress(m.Repo.RepoPath()) if err != nil { - log.Error(4, "remoteAddress: %v", err) + log.Error("remoteAddress: %v", err) } } @@ -164,12 +164,12 @@ func parseRemoteUpdateOutput(output string) []*mirrorSyncResult { case strings.HasPrefix(lines[i], " "): // New commits of a reference delimIdx := strings.Index(lines[i][3:], " ") if delimIdx == -1 { - log.Error(2, "SHA delimiter not found: %q", lines[i]) + log.Error("SHA delimiter not found: %q", lines[i]) continue } shas := strings.Split(lines[i][3:delimIdx+3], "..") if len(shas) != 2 { - log.Error(2, "Expect two SHAs but not what found: %q", lines[i]) + log.Error("Expect two SHAs but not what found: %q", lines[i]) continue } results = append(results, &mirrorSyncResult{ @@ -204,13 +204,13 @@ func (m *Mirror) runSync() ([]*mirrorSyncResult, bool) { // contain a password message, err := sanitizeOutput(stderr, repoPath) if err != nil { - log.Error(4, "sanitizeOutput: %v", err) + log.Error("sanitizeOutput: %v", err) return nil, false } desc := fmt.Sprintf("Failed to update mirror repository '%s': %s", repoPath, message) - log.Error(4, desc) + log.Error(desc) if err = CreateRepositoryNotice(desc); err != nil { - log.Error(4, "CreateRepositoryNotice: %v", err) + log.Error("CreateRepositoryNotice: %v", err) } return nil, false } @@ -218,15 +218,15 @@ func (m *Mirror) runSync() ([]*mirrorSyncResult, bool) { gitRepo, err := git.OpenRepository(repoPath) if err != nil { - log.Error(4, "OpenRepository: %v", err) + log.Error("OpenRepository: %v", err) return nil, false } if err = SyncReleasesWithTags(m.Repo, gitRepo); err != nil { - log.Error(4, "Failed to synchronize tags to releases for repository: %v", err) + log.Error("Failed to synchronize tags to releases for repository: %v", err) } if err := m.Repo.UpdateSize(); err != nil { - log.Error(4, "Failed to update size for mirror repository: %v", err) + log.Error("Failed to update size for mirror repository: %v", err) } if m.Repo.HasWiki() { @@ -237,13 +237,13 @@ func (m *Mirror) runSync() ([]*mirrorSyncResult, bool) { // contain a password message, err := sanitizeOutput(stderr, wikiPath) if err != nil { - log.Error(4, "sanitizeOutput: %v", err) + log.Error("sanitizeOutput: %v", err) return nil, false } desc := fmt.Sprintf("Failed to update mirror wiki repository '%s': %s", wikiPath, message) - log.Error(4, desc) + log.Error(desc) if err = CreateRepositoryNotice(desc); err != nil { - log.Error(4, "CreateRepositoryNotice: %v", err) + log.Error("CreateRepositoryNotice: %v", err) } return nil, false } @@ -251,7 +251,7 @@ func (m *Mirror) runSync() ([]*mirrorSyncResult, bool) { branches, err := m.Repo.GetBranches() if err != nil { - log.Error(4, "GetBranches: %v", err) + log.Error("GetBranches: %v", err) return nil, false } @@ -310,14 +310,14 @@ func MirrorUpdate() { Iterate(new(Mirror), func(idx int, bean interface{}) error { m := bean.(*Mirror) if m.Repo == nil { - log.Error(4, "Disconnected mirror repository found: %d", m.ID) + log.Error("Disconnected mirror repository found: %d", m.ID) return nil } MirrorQueue.Add(m.RepoID) return nil }); err != nil { - log.Error(4, "MirrorUpdate: %v", err) + log.Error("MirrorUpdate: %v", err) } } @@ -333,7 +333,7 @@ func SyncMirrors() { m, err := GetMirrorByRepoID(com.StrTo(repoID).MustInt64()) if err != nil { - log.Error(4, "GetMirrorByRepoID [%s]: %v", repoID, err) + log.Error("GetMirrorByRepoID [%s]: %v", repoID, err) continue } @@ -344,7 +344,7 @@ func SyncMirrors() { m.ScheduleNextUpdate() if err = updateMirror(sess, m); err != nil { - log.Error(4, "UpdateMirror [%s]: %v", repoID, err) + log.Error("UpdateMirror [%s]: %v", repoID, err) continue } @@ -354,7 +354,7 @@ func SyncMirrors() { } else { gitRepo, err = git.OpenRepository(m.Repo.RepoPath()) if err != nil { - log.Error(2, "OpenRepository [%d]: %v", m.RepoID, err) + log.Error("OpenRepository [%d]: %v", m.RepoID, err) continue } } @@ -368,7 +368,7 @@ func SyncMirrors() { // Create reference if result.oldCommitID == gitShortEmptySha { if err = MirrorSyncCreateAction(m.Repo, result.refName); err != nil { - log.Error(2, "MirrorSyncCreateAction [repo_id: %d]: %v", m.RepoID, err) + log.Error("MirrorSyncCreateAction [repo_id: %d]: %v", m.RepoID, err) } continue } @@ -376,7 +376,7 @@ func SyncMirrors() { // Delete reference if result.newCommitID == gitShortEmptySha { if err = MirrorSyncDeleteAction(m.Repo, result.refName); err != nil { - log.Error(2, "MirrorSyncDeleteAction [repo_id: %d]: %v", m.RepoID, err) + log.Error("MirrorSyncDeleteAction [repo_id: %d]: %v", m.RepoID, err) } continue } @@ -384,17 +384,17 @@ func SyncMirrors() { // Push commits oldCommitID, err := git.GetFullCommitID(gitRepo.Path, result.oldCommitID) if err != nil { - log.Error(2, "GetFullCommitID [%d]: %v", m.RepoID, err) + log.Error("GetFullCommitID [%d]: %v", m.RepoID, err) continue } newCommitID, err := git.GetFullCommitID(gitRepo.Path, result.newCommitID) if err != nil { - log.Error(2, "GetFullCommitID [%d]: %v", m.RepoID, err) + log.Error("GetFullCommitID [%d]: %v", m.RepoID, err) continue } commits, err := gitRepo.CommitsBetweenIDs(newCommitID, oldCommitID) if err != nil { - log.Error(2, "CommitsBetweenIDs [repo_id: %d, new_commit_id: %s, old_commit_id: %s]: %v", m.RepoID, newCommitID, oldCommitID, err) + log.Error("CommitsBetweenIDs [repo_id: %d, new_commit_id: %s, old_commit_id: %s]: %v", m.RepoID, newCommitID, oldCommitID, err) continue } if err = MirrorSyncPushAction(m.Repo, MirrorSyncPushActionOptions{ @@ -403,7 +403,7 @@ func SyncMirrors() { NewCommitID: newCommitID, Commits: ListToPushCommits(commits), }); err != nil { - log.Error(2, "MirrorSyncPushAction [repo_id: %d]: %v", m.RepoID, err) + log.Error("MirrorSyncPushAction [repo_id: %d]: %v", m.RepoID, err) continue } } @@ -411,12 +411,12 @@ func SyncMirrors() { // Get latest commit date and update to current repository updated time commitDate, err := git.GetLatestCommitTime(m.Repo.RepoPath()) if err != nil { - log.Error(2, "GetLatestCommitDate [%s]: %v", m.RepoID, err) + log.Error("GetLatestCommitDate [%d]: %v", m.RepoID, err) continue } if _, err = sess.Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", commitDate.Unix(), m.RepoID); err != nil { - log.Error(2, "Update repository 'updated_unix' [%s]: %v", m.RepoID, err) + log.Error("Update repository 'updated_unix' [%d]: %v", m.RepoID, err) continue } } |