diff options
author | Wim <wim@42.be> | 2022-03-12 19:41:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-12 19:41:07 +0100 |
commit | b3be2e208cb373207d6199cac5a9fc92be073e7a (patch) | |
tree | 6de6d444737edee8f0476eea87c233fa980f0002 /vendor/github.com/mattermost/mattermost-server/v6/shared | |
parent | c30e90ff3f7e9ff96ac79ed4b7d90d6346216a15 (diff) | |
download | matterbridge-msglm-b3be2e208cb373207d6199cac5a9fc92be073e7a.tar.gz matterbridge-msglm-b3be2e208cb373207d6199cac5a9fc92be073e7a.tar.bz2 matterbridge-msglm-b3be2e208cb373207d6199cac5a9fc92be073e7a.zip |
Update dependencies and vendor (#1761)
Diffstat (limited to 'vendor/github.com/mattermost/mattermost-server/v6/shared')
-rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/shared/filestore/s3_overrides.go | 2 | ||||
-rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/shared/mlog/mlog.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/mattermost/mattermost-server/v6/shared/filestore/s3_overrides.go b/vendor/github.com/mattermost/mattermost-server/v6/shared/filestore/s3_overrides.go index e7b29b98..697809ee 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/shared/filestore/s3_overrides.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/shared/filestore/s3_overrides.go @@ -23,7 +23,7 @@ type customTransport struct { // RoundTrip implements the http.Roundtripper interface. func (t *customTransport) RoundTrip(req *http.Request) (*http.Response, error) { - // Rountrippers should not modify the original request. + // Roundtrippers should not modify the original request. newReq := req.Clone(context.Background()) *newReq.URL = *req.URL req.URL.Scheme = t.scheme diff --git a/vendor/github.com/mattermost/mattermost-server/v6/shared/mlog/mlog.go b/vendor/github.com/mattermost/mattermost-server/v6/shared/mlog/mlog.go index 0f4cc1fe..9b4bb820 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/shared/mlog/mlog.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/shared/mlog/mlog.go @@ -352,7 +352,7 @@ func (l *Logger) RedirectStdLog(level Level, fields ...Field) func() { // RemoveTargets safely removes one or more targets based on the filtering method. // `f` should return true to delete the target, false to keep it. // When removing a target, best effort is made to write any queued log records before -// closing, with cxt determining how much time can be spent in total. +// closing, with ctx determining how much time can be spent in total. // Note, keep the timeout short since this method blocks certain logging operations. func (l *Logger) RemoveTargets(ctx context.Context, f func(ti TargetInfo) bool) error { return l.log.Logr().RemoveTargets(ctx, f) @@ -379,7 +379,7 @@ func (l *Logger) Flush() error { return l.log.Logr().FlushWithTimeout(ctx) } -// Flush forces all targets to write out any queued log records with the specfified timeout. +// Flush forces all targets to write out any queued log records with the specified timeout. func (l *Logger) FlushWithTimeout(ctx context.Context) error { return l.log.Logr().FlushWithTimeout(ctx) } |