Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2820 from castrapel/celery_time_limit_sync 

Relax celery time limit for source syncing; Ensure metric tags are string
This commit is contained in:
Hossein Shafagh 2019-07-01 11:14:05 -07:00 committed by GitHub
parent ff3016e65e 0c5a8f2039
commit c7398d9e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/common/celery.py
View File

@ -252,7 +252,7 @@ def sync_all_sources():
sync_source.delay(source.label) sync_source.delay(source.label)
@celery.task(soft_time_limit=3600) @celery.task(soft_time_limit=7200)
def sync_source(source): def sync_source(source):
""" """
This celery task will sync the specified source. This celery task will sync the specified source.

14
lemur/plugins/lemur_aws/elb.py
View File

@ -27,7 +27,7 @@ def retry_throttled(exception):
raise exception raise exception
except Exception as e: except Exception as e:
current_app.logger.error("ELB retry_throttled triggered", exc_info=True) current_app.logger.error("ELB retry_throttled triggered", exc_info=True)
metrics.send("elb_retry", "counter", 1, metric_tags={"exception": e}) metrics.send("elb_retry", "counter", 1, metric_tags={"exception": str(e)})
sentry.captureException() sentry.captureException()
if isinstance(exception, botocore.exceptions.ClientError): if isinstance(exception, botocore.exceptions.ClientError):
@ -135,7 +135,7 @@ def get_listener_arn_from_endpoint(endpoint_name, endpoint_port, **kwargs):
"counter", "counter",
1, 1,
metric_tags={ metric_tags={
"error": e, "error": str(e),
"endpoint_name": endpoint_name, "endpoint_name": endpoint_name,
"endpoint_port": endpoint_port, "endpoint_port": endpoint_port,
}, },
@ -159,7 +159,7 @@ def get_elbs(**kwargs):
client = kwargs.pop("client") client = kwargs.pop("client")
return client.describe_load_balancers(**kwargs) return client.describe_load_balancers(**kwargs)
except Exception as e: # noqa except Exception as e: # noqa
metrics.send("get_elbs_error", "counter", 1, metric_tags={"error": e}) metrics.send("get_elbs_error", "counter", 1, metric_tags={"error": str(e)})
sentry.captureException() sentry.captureException()
raise raise
@ -177,7 +177,7 @@ def get_elbs_v2(**kwargs):
client = kwargs.pop("client") client = kwargs.pop("client")
return client.describe_load_balancers(**kwargs) return client.describe_load_balancers(**kwargs)
except Exception as e: # noqa except Exception as e: # noqa
metrics.send("get_elbs_v2_error", "counter", 1, metric_tags={"error": e}) metrics.send("get_elbs_v2_error", "counter", 1, metric_tags={"error": str(e)})
sentry.captureException() sentry.captureException()
raise raise
@ -196,7 +196,7 @@ def describe_listeners_v2(**kwargs):
return client.describe_listeners(**kwargs) return client.describe_listeners(**kwargs)
except Exception as e: # noqa except Exception as e: # noqa
metrics.send( metrics.send(
"describe_listeners_v2_error", "counter", 1, metric_tags={"error": e} "describe_listeners_v2_error", "counter", 1, metric_tags={"error": str(e)}
) )
sentry.captureException() sentry.captureException()
raise raise
@ -224,7 +224,7 @@ def describe_load_balancer_policies(load_balancer_name, policy_names, **kwargs):
metric_tags={ metric_tags={
"load_balancer_name": load_balancer_name, "load_balancer_name": load_balancer_name,
"policy_names": policy_names, "policy_names": policy_names,
"error": e, "error": str(e),
}, },
) )
sentry.captureException( sentry.captureException(
@ -252,7 +252,7 @@ def describe_ssl_policies_v2(policy_names, **kwargs):
"describe_ssl_policies_v2_error", "describe_ssl_policies_v2_error",
"counter", "counter",
1, 1,
metric_tags={"policy_names": policy_names, "error": e}, metric_tags={"policy_names": policy_names, "error": str(e)},
) )
sentry.captureException(extra={"policy_names": str(policy_names)}) sentry.captureException(extra={"policy_names": str(policy_names)})
raise raise