beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[server] Clean up collecitonDiff logs

Browse source
This commit is contained in:
Neeraj Gupta 2024-03-11 12:02:51 +05:30 committed by Neeraj Gupta
parent 412c872266
commit 12903a3748
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/pkg/controller/collection.go
View file

@ -472,17 +472,14 @@ func (c *CollectionController) GetDiffV2(ctx *gin.Context, cID int64, userID int
"since_time": sinceTime,
"req_id": requestid.Get(ctx),
})
reqContextLogger.Info("Start")
_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
CollectionID: cID,
ActorUserID: userID,
})
reqContextLogger.Info("Accessible")
if err != nil {
return nil, false, stacktrace.Propagate(err, "failed to verify access")
}
diff, hasMore, err := c.getDiff(cID, sinceTime, CollectionDiffLimit, reqContextLogger)
reqContextLogger.Info("Received diff")
if err != nil {
return nil, false, stacktrace.Propagate(err, "")
}
@ -492,7 +489,6 @@ func (c *CollectionController) GetDiffV2(ctx *gin.Context, cID int64, userID int
diff[idx].MagicMetadata = nil
}
}
reqContextLogger.Info("Function end")
return diff, hasMore, nil
}
@ -559,10 +555,8 @@ func (c *CollectionController) GetPublicDiff(ctx *gin.Context, sinceTime int64)
// case 4: (sinceTime: v0, limit >=10):
// The method will all 10 entries in the diff
func (c *CollectionController) getDiff(cID int64, sinceTime int64, limit int, logger *log.Entry) ([]ente.File, bool, error) {
logger.Info("getDiff")
// request for limit +1 files
diffLimitPlusOne, err := c.CollectionRepo.GetDiff(cID, sinceTime, limit+1)
logger.Info("Got diff from repo")
if err != nil {
return nil, false, stacktrace.Propagate(err, "")
}
@ -572,13 +566,24 @@ func (c *CollectionController) getDiff(cID int64, sinceTime int64, limit int, lo
}
lastFileVersion := diffLimitPlusOne[limit].UpdationTime
filteredDiffs := c.removeFilesWithVersion(diffLimitPlusOne, lastFileVersion)
logger.Info("Removed files with out of bounds version")
if len(filteredDiffs) > 0 { // case 1 or case 3
filteredDiffLen := len(filteredDiffs)
if filteredDiffLen > 0 { // case 1 or case 3
if filteredDiffLen < limit {
// logging case 1
logger.
WithField("last_file_version", lastFileVersion).
WithField("filtered_diff_len", filteredDiffLen).
Info("returning less than limit files in diff")
}
return filteredDiffs, true, nil
}
// case 2
diff, err := c.CollectionRepo.GetFilesWithVersion(cID, lastFileVersion)
logger.Info("Got diff of files with latest file version")
logger.
WithField("last_file_version", lastFileVersion).
WithField("count", len(diff)).
Info(fmt.Sprintf("more than %d files with same version", limit))
if err != nil {
return nil, false, stacktrace.Propagate(err, "")
}