diff --git a/base/error.go b/base/error.go index 7365967e74..bed9095d4f 100644 --- a/base/error.go +++ b/base/error.go @@ -41,7 +41,7 @@ var ( ErrNotFound = &sgError{"Not Found"} ErrUpdateCancel = &sgError{"Cancel update"} ErrImportCancelledPurged = HTTPErrorf(http.StatusNotFound, "Import Cancelled Due to Purge") - ErrChannelFeed = &sgError{"Error while building channel feed"} + ErrChannelFeed = &sgError{"Failed to build channel feed"} ErrTimeout = &sgError{"Operation timed out"} ErrPathNotFound = sgbucket.ErrPathNotFound ErrPathExists = sgbucket.ErrPathExists diff --git a/db/changes.go b/db/changes.go index 18c58aba7b..508a3dd93b 100644 --- a/db/changes.go +++ b/db/changes.go @@ -480,7 +480,7 @@ func (db *DatabaseCollectionWithUser) changesFeed(ctx context.Context, singleCha base.TracefCtx(ctx, base.KeyChanges, "Querying channel %q with options: %+v", base.UD(singleChannelCache.ChannelID().Name), paginationOptions) changes, err := singleChannelCache.GetChanges(ctx, paginationOptions) if err != nil { - base.WarnfCtx(ctx, "Error retrieving changes for channel %q: %v", base.UD(singleChannelCache.ChannelID().Name), err) + base.InfofCtx(ctx, base.KeyChanges, "Could not retrieve changes for channel %q: %v", base.UD(singleChannelCache.ChannelID().Name), err) change := ChangeEntry{ Err: base.ErrChannelFeed, } @@ -996,7 +996,7 @@ func (col *DatabaseCollectionWithUser) SimpleMultiChangesFeed(ctx context.Contex } else { // On feed error, send the error and exit changes processing if current[i].Err == base.ErrChannelFeed { - base.WarnfCtx(ctx, "MultiChangesFeed got error reading changes feed: %v", current[i].Err) + base.InfofCtx(ctx, base.KeyChanges, "Could not read changes feed: %v", current[i].Err) select { case <-options.ChangesCtx.Done(): case output <- current[i]: diff --git a/db/channel_cache_single.go b/db/channel_cache_single.go index 09cfe2f8fc..f2b5665d11 100644 --- a/db/channel_cache_single.go +++ b/db/channel_cache_single.go @@ -413,7 +413,7 @@ func (c *singleChannelCacheImpl) GetChanges(ctx context.Context, options Changes // Check whether the changes process has been terminated while we waited for the view lock, to avoid the view // overhead in that case (and prevent feedback loop on query backlog) if options.ChangesCtx.Err() != nil { - return nil, fmt.Errorf("Changes feed cancelled while waiting for view lock") + return nil, fmt.Errorf("Changes feed cancelled") } // Now query the view. We set the max sequence equal to cacheValidFrom, so we'll get one