|
|
@@ -124,22 +124,22 @@ class Cache:
|
|
|
delay_action.uuid = str(uuid.uuid4())
|
|
|
key = CTI_ENGINE_DELAY_ACTION % action
|
|
|
msg = delay_action.to_json_string()
|
|
|
- action_time = datetime.utcnow().timestamp() + timeouts * 1000
|
|
|
+ action_time = datetime.utcnow().timestamp()*1000 + timeouts * 1000
|
|
|
self.redis_handler.redis.zadd(key, {msg : action_time})
|
|
|
|
|
|
def get_delay_message(self, action):
|
|
|
key = CTI_ENGINE_DELAY_ACTION % action
|
|
|
- current_time = int(time.time() * 1000) # 毫秒级时间戳
|
|
|
+ current_time = int(datetime.utcnow().timestamp() * 1000) # 毫秒级时间戳
|
|
|
members = self.redis_handler.redis.zrangebyscore(key, 0, current_time, start=0, num=DELAY_ACTION_BATCH_SIZE, withscores=True)
|
|
|
if not members:
|
|
|
return []
|
|
|
- print('get_delay_message %s %s %s'%(key, action, members), flush=True)
|
|
|
+ self.logger.info('get_delay_message %s %s %s'%(key, action, members))
|
|
|
# scored_entries = [{"member": entry[0].decode('utf-8'), "score": entry[1]} for entry in members]
|
|
|
action_list = [entry[0].decode('utf-8') for entry in members]
|
|
|
- print('get_delay_message %s %s %s'%(key, action, json.dumps(action_list)), flush=True)
|
|
|
+ self.logger.info('get_delay_message %s %s %s'%(key, action, json.dumps(action_list)))
|
|
|
if action_list:
|
|
|
a = self.redis_handler.redis.zrem(key, *action_list)
|
|
|
- print('get_delay_message %s %s %s %s'%(key, action, json.dumps(action_list), a), flush=True)
|
|
|
+ self.logger.info('get_delay_message %s %s %s %s'%(key, action, json.dumps(action_list), a))
|
|
|
return action_list
|
|
|
|
|
|
def lock_delay_action(self, val):
|
DavidLiu