Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pass network time down to Expire()

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-03-09 21:04:21 -07:00
parent c7503654e8
commit ebefb21c53
6 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/storage/backend/redis/Redis.cc
View file

@ -351,7 +351,7 @@ OperationResult Redis::DoErase(ValPtr key, OperationResultCallback* cb) {
return {ReturnCode::IN_PROGRESS};
}
void Redis::DoExpire() {
void Redis::DoExpire(double current_network_time) {
// Expiration is handled natively by Redis if not reading traces.
if ( ! connected || ! zeek::run_state::reading_traces )
return;
@ -361,7 +361,7 @@ void Redis::DoExpire() {
during_expire = true;
int status = redisAsyncCommand(async_ctx, redisGeneric, NULL, "ZRANGEBYSCORE %s_expire -inf %f", key_prefix.data(),
run_state::network_time);
current_network_time);
if ( status == REDIS_ERR ) {
// TODO: do something with the error?
@ -407,7 +407,7 @@ void Redis::DoExpire() {
// Remove all of the elements from the range-set that match the time range.
redisAsyncCommand(async_ctx, redisGeneric, NULL, "ZREMRANGEBYSCORE %s_expire -inf %f", key_prefix.data(),
run_state::network_time);
current_network_time);
++active_ops;
Poll();