Skip to content

Commit 4ad6a96

Browse files
authored
chore: make rate limiter fail-open (frain-dev#1950)
1 parent 6f7cc63 commit 4ad6a96

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

cmd/agent/agent.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,9 @@ func AddAgentCommand(a *cli.App) *cobra.Command {
7373
return err
7474
}
7575

76-
// block the main thread.
77-
// trap Ctrl+C and call cancel on the context
78-
7976
select {
8077
case <-quit:
81-
cancel()
78+
return nil
8279
case <-ctx.Done():
8380
}
8481

internal/pkg/limiter/pg/client.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,23 @@ func (p *SlidingWindowRateLimiter) takeToken(ctx context.Context, key string, ra
3131

3232
tx, err := p.db.GetDB().BeginTxx(ctx, nil)
3333
if err != nil {
34-
return err
34+
log.Infof("ratelimit failed: %v", err)
35+
return nil
3536
}
3637

3738
var allowed bool
3839
err = tx.QueryRowContext(ctx, `select convoy.take_token($1, $2, $3)::bool;`, key, rate, windowSize).Scan(&allowed)
3940
if err != nil {
40-
return err
41+
log.Infof("ratelimit failed: %v", err)
42+
return nil
4143
}
4244

4345
err = tx.Commit()
4446
if err != nil {
4547
if rollbackErr := tx.Rollback(); rollbackErr != nil {
4648
log.Infof("update failed: %v, unable to rollback: %v", err, rollbackErr)
4749
}
48-
return err
50+
return nil
4951
}
5052

5153
if !allowed {

0 commit comments

Comments
 (0)