Skip to content

Commit 69434bb

Browse files
committed
1.7.2-beta2 修复redis集群模式时,tools中报警频率限制的bug
1 parent 216e68d commit 69434bb

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

feapder/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.2-beta1
1+
1.7.2-beta2

feapder/utils/tools.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
from w3lib.url import canonicalize_url as _canonicalize_url
4646

4747
import feapder.setting as setting
48+
from feapder.db.redisdb import RedisDB
4849
from feapder.utils.email_sender import EmailSender
4950
from feapder.utils.log import log
5051

@@ -62,14 +63,7 @@
6263
def get_redisdb():
6364
global redisdb
6465
if not redisdb:
65-
ip, port = setting.REDISDB_IP_PORTS.split(":")
66-
redisdb = redis.Redis(
67-
host=ip,
68-
port=port,
69-
db=setting.REDISDB_DB,
70-
password=setting.REDISDB_USER_PASS,
71-
decode_responses=True,
72-
) # redis默认端口是6379
66+
redisdb = RedisDB()
7367
return redisdb
7468

7569

@@ -2283,10 +2277,10 @@ def reach_freq_limit(rate_limit, *key):
22832277
msg_md5 = get_md5(*key)
22842278
key = "rate_limit:{}".format(msg_md5)
22852279
try:
2286-
if get_redisdb().get(key):
2280+
if get_redisdb().strget(key):
22872281
return True
22882282

2289-
get_redisdb().set(key, time.time(), ex=rate_limit)
2283+
get_redisdb().strset(key, time.time(), ex=rate_limit)
22902284
except redis.exceptions.ConnectionError as e:
22912285
# 使用内存做频率限制
22922286
global freq_limit_record

0 commit comments

Comments
 (0)