Skip to content

Commit

Permalink
Merge pull request #1867 from DSD-DBS/log-opimization
Browse files Browse the repository at this point in the history
refactor: Tune log levels
  • Loading branch information
MoritzWeber0 authored Oct 1, 2024
2 parents 1989a84 + a9bf8a4 commit 04e9d18
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 28 deletions.
6 changes: 2 additions & 4 deletions backend/capellacollab/core/authentication/oidc.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ def refresh_token(self, _refresh_token: str) -> dict[str, t.Any]:
return self.web_client.parse_request_body_response(
r.text, scope=self.oidc_config.get_scopes()
)
except Exception as e:
logger.debug(
"Could not refresh token because of exception %s", str(e)
)
except Exception:
logger.info("Could not refresh token", exc_info=True)
raise exceptions.RefreshTokenSignatureExpired()
2 changes: 1 addition & 1 deletion backend/capellacollab/sessions/injection.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get_last_seen(sid: str) -> str:
if sid == session["metric"]["session_id"]:
return _get_last_seen(float(session["value"][1]))

log.error("No session was found.")
log.debug("Couldn't find Prometheus metrics for session %s.", sid)
except Exception:
log.exception("Exception during fetching of last seen.")
return "UNKNOWN"
Expand Down
63 changes: 40 additions & 23 deletions backend/capellacollab/sessions/operators/k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,17 +336,25 @@ def delete_cronjob(self, _id: str):
self.v1_batch.delete_namespaced_cron_job(
namespace=namespace, name=_id
)
except exceptions.ApiException:
log.exception("Error deleting cronjob with name: %s", _id)
except exceptions.ApiException as e:
# Cronjob doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return
raise

def delete_job(self, name: str):
log.info("Deleting job '%s' in cluster", name)
try:
self.v1_batch.delete_namespaced_job(
namespace=namespace, name=name, propagation_policy="Background"
)
except exceptions.ApiException:
log.error("Error deleting job with name: %s", name)
except exceptions.ApiException as e:
# Job doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return
raise

def get_pod_name_from_job_name(self, job_name: str) -> str | None:
return self._get_pod_id(label_selector=f"job-name={job_name}")
Expand Down Expand Up @@ -893,45 +901,54 @@ def _create_promtail_configmap(
def _delete_deployment(self, name: str) -> client.V1Status | None:
try:
return self.v1_apps.delete_namespaced_deployment(name, namespace)
except exceptions.ApiException:
log.exception("Error deleting deployment with name: %s", name)
return None
except exceptions.ApiException as e:
# Deployment doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return None
raise

def delete_secret(self, name: str) -> kubernetes.client.V1Status | None:
try:
return self.v1_core.delete_namespaced_secret(name, namespace)
except client.exceptions.ApiException:
log.exception("Error deleting secret with name: %s", name)
return None
except exceptions.ApiException as e:
# Secret doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return None
raise

def _delete_config_map(self, name: str) -> client.V1Status | None:
try:
return self.v1_core.delete_namespaced_config_map(name, namespace)
except exceptions.ApiException:
log.exception("Error deleting config map with name: %s", name)
return None
except exceptions.ApiException as e:
# Config map doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return None
raise

def _delete_service(self, name: str) -> client.V1Status | None:
try:
return self.v1_core.delete_namespaced_service(name, namespace)
except exceptions.ApiException:
log.exception("Error deleting service with name: %s", name)
return None
except exceptions.ApiException as e:
# Service doesn't exist or was already deleted
# Nothing to do
if e.status == http.HTTPStatus.NOT_FOUND:
return None
raise

def _delete_disruptionbudget(self, name: str) -> client.V1Status | None:
try:
return self.v1_policy.delete_namespaced_pod_disruption_budget(
name, namespace
)
except exceptions.ApiException as e:
# Pod disruption budge doesn't exist or was already deleted
# Pod disruption budget doesn't exist or was already deleted
# Nothing to do
if not e.status == http.HTTPStatus.NOT_FOUND:
log.exception(
"Error deleting discruptionbudget with name: %s", name
)

return None
if e.status == http.HTTPStatus.NOT_FOUND:
return None
raise

def _get_pod_name(self, _id: str) -> str:
return self.get_pods(label_selector=f"app={_id}")[0].metadata.name
Expand Down

0 comments on commit 04e9d18

Please sign in to comment.