diff --git a/repoapi/models/gri.py b/repoapi/models/gri.py index 3aaf2f3..09616ba 100644 --- a/repoapi/models/gri.py +++ b/repoapi/models/gri.py @@ -37,7 +37,7 @@ class GerritRepoInfo(models.Model): def gerrit_repo_add(instance): log = logger.bind( - instance=instance, + instance=str(instance), ) if instance.param_ppa == "$ppa": log.warn("ppa unset, skip removal") @@ -49,7 +49,7 @@ def gerrit_repo_add(instance): defaults={"projectname": instance.projectname}, ) if created: - log.debug("ppa created", ppa=ppa) + log.debug("ppa created", ppa=str(ppa)) elif ppa.projectname == "unknown": ppa.projectname = instance.projectname ppa.save() @@ -58,7 +58,7 @@ def gerrit_repo_add(instance): def gerrit_repo_del(instance): log = logger.bind( - instance=instance, + instance=str(instance), ) if instance.param_ppa == "$ppa": log.warn("ppa unset, skip removal") @@ -69,7 +69,7 @@ def gerrit_repo_del(instance): param_ppa=instance.param_ppa, gerrit_change=instance.gerrit_change ) ppa.delete() - log.debug("removed ppa", ppa=ppa) + log.debug("removed ppa", ppa=str(ppa)) except GerritRepoInfo.DoesNotExist: pass qs = gri.filter(param_ppa=instance.param_ppa) @@ -92,7 +92,7 @@ def gerrit_repo_manage(sender, **kwargs): if kwargs["created"]: instance = kwargs["instance"] log = logger.bind( - instance=instance, + instance=str(instance), ppa=instance.param_ppa, ) if instance.param_ppa == "$ppa": @@ -112,5 +112,5 @@ def gerrit_repo_manage(sender, **kwargs): and instance.result == "SUCCESS" and instance.gerrit_eventtype == "change-abandoned" ): - logger.debug("we need to count this") + log.debug("we need to count this") gerrit_repo_del(instance) diff --git a/repoapi/tasks.py b/repoapi/tasks.py index 1d25de4..d39d302 100644 --- a/repoapi/tasks.py +++ b/repoapi/tasks.py @@ -38,7 +38,7 @@ def jenkins_remove_project(self, jbi_id): JenkinsBuildInfo = apps.get_model("repoapi", "JenkinsBuildInfo") jbi = JenkinsBuildInfo.objects.get(id=jbi_id) log = logger.bind( - jbi=jbi, + jbi=str(jbi), ) if ( jbi.jobname.endswith("-repos") diff --git a/repoapi/utils.py b/repoapi/utils.py index 9c8480b..9e40034 100644 --- a/repoapi/utils.py +++ b/repoapi/utils.py @@ -59,7 +59,7 @@ def dlfile(url, path): path=path, ) if settings.DEBUG: - log.info("_NOT_ calling due to DEBUG is set", url) + log.info("_NOT_ calling due to DEBUG is set") else: auth = HTTPBasicAuth( settings.JENKINS_HTTP_USER, settings.JENKINS_HTTP_PASSWD @@ -83,7 +83,7 @@ def open_jenkins_url(url): except requests.HTTPError as e: log.error("Error %s", e, status_code=res.status_code) except Exception as e: - log.error("Fatal error retrieving: %s", e) + log.error("Fatal error retrieving:", error=str(e)) return False @@ -99,7 +99,7 @@ def jenkins_remove_ppa(repo): url=url, ) if settings.DEBUG: - log.debug("_NOT_ calling due to DEBUG is set", url) + log.debug("_NOT_ calling due to DEBUG is set") else: open_jenkins_url(url) @@ -131,7 +131,7 @@ def _jenkins_get(url, base_path, filename): filename=filename, url=url, ) - log.debug("download file from jenkins", url, path) + log.debug("download file from jenkins") dlfile(url, path) return path @@ -176,7 +176,9 @@ def workfront_note_send(_id, message): ] res = executeAndReturnOutput(command) if res[0] != 0: - logger.error("can't post workfront note. %s. %s", res[1], res[2]) + logger.error( + "can't post workfront notes", stdout=res[1], stderr=res[2] + ) return False return True @@ -186,7 +188,7 @@ def get_next_release(branch): res = executeAndReturnOutput(command) if res[0] != 0: logger.error( - "can't find out next release version. %s. %s", res[1], res[2] + "can't find out next release version", stdout=res[1], stderr=res[2] ) return None val = res[1].rstrip() @@ -212,7 +214,7 @@ def workfront_set_release_target(_id, release): ] res = executeAndReturnOutput(command) if res[0] != 0: - logger.error("can't set release target. %s. %s", res[1], res[2]) + logger.error("can't set release target", stdout=res[1], stderr=res[2]) return False return True