diff --git a/flask-consul/units/cloud/tencent_cloud.py b/flask-consul/units/cloud/tencent_cloud.py index 60ad43f..369004e 100644 --- a/flask-consul/units/cloud/tencent_cloud.py +++ b/flask-consul/units/cloud/tencent_cloud.py @@ -21,10 +21,10 @@ def exp(account,collect_days,notify_days,notify_amount): now = datetime.datetime.now() for i in ecs_list: exp_day = datetime.datetime.strptime(i['exp'], '%Y-%m-%d') - if (now - exp_day).days <= collect_days: + if (exp_day - now).days <= collect_days: exp_dict[i['iid']] = {'Region':i['region'],'Product':i['os'],'Name':i['name'], 'EndTime':i['exp'],'Ptype':i['cpu']+i['mem'],'Group':i['group']} - if (now - exp_day).days <= notify_days: + if (exp_day - now).days <= notify_days: notify_dict[i['iid']] = exp_dict[i['iid']] consul_kv.put_kv(f'ConsulManager/exp/lists/tencent_cloud/{account}/exp', exp_dict) diff --git a/flask-consul/views/exp.py b/flask-consul/views/exp.py index 02e1627..17ca917 100644 --- a/flask-consul/views/exp.py +++ b/flask-consul/views/exp.py @@ -26,7 +26,7 @@ class Exp(Resource): exp_config_dict = args['exp_config_dict'] consul_kv.put_kv('ConsulManager/exp/config',exp_config_dict) cloud_job_list = consul_kv.get_keys_list('ConsulManager/jobs') - cloud_list = [i for i in cloud_job_list if i.endswith('/group') and 'tencent_cloud' in i] + cloud_list = [i for i in cloud_job_list if i.endswith('/group')] collect_days = exp_config_dict['collect_days'] notify_days = exp_config_dict['notify_days'] notify_amount = exp_config_dict['notify_amount']