diff --git a/NEWS.rst b/NEWS.rst index 2fdfb808326f0c3e9c202fda0910ff9ba089b771_TkVXUy5yc3Q=..edbd9c77e59d790ff12c88691120bed5e66e198d_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -12,6 +12,8 @@ Move constant converter to converter module. Fix a docstring (not an override). +Credit OCA for report code. +Improve logging - request contents only logged at debug level. 13.0.2.0.1 ========== diff --git a/__manifest__.py b/__manifest__.py index 2fdfb808326f0c3e9c202fda0910ff9ba089b771_X19tYW5pZmVzdF9fLnB5..edbd9c77e59d790ff12c88691120bed5e66e198d_X19tYW5pZmVzdF9fLnB5 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -21,7 +21,7 @@ "name": "Redner", "summary": """ Allows to generate transactional emails and documents in PDF or HTML format""", - "version": "13.0.3.0.1", + "version": "13.0.3.0.2", "category": "Technical", "author": "XCG Consulting", "website": "http://odoo.consulting/", diff --git a/models/redner.py b/models/redner.py index 2fdfb808326f0c3e9c202fda0910ff9ba089b771_bW9kZWxzL3JlZG5lci5weQ==..edbd9c77e59d790ff12c88691120bed5e66e198d_bW9kZWxzL3JlZG5lci5weQ== 100644 --- a/models/redner.py +++ b/models/redner.py @@ -41,6 +41,7 @@ return self.call_impl(path, http_verb=http_verb, **params) except Exception as error: if retry_counter == MAX_REDNERD_TRIES - 1: + logger.error("Redner error: %s", str(error)) raise error def call_impl(self, path, http_verb="post", **params): @@ -51,6 +52,8 @@ path(str): URL path to query, eg. '/template/' http_verb(str): http verb to use, default: 'post' params(dict): json payload + + This method can raise anything; callers are expected to catch. """ if not self.server_url: @@ -59,6 +62,6 @@ "Please add it in odoo.conf or in ir.config_parameter" ) - endpoint = urljoin(self.server_url, path) + url = urljoin(self.server_url, path) _http_verb = http_verb.upper() @@ -63,6 +66,7 @@ _http_verb = http_verb.upper() - logger.info("%s to %s: %s" % (_http_verb, endpoint, params)) + logger.info("Redner: Calling %s...", _http_verb) + logger.debug("Redner: Sending to %s > %s", url, params) start = time.time() r = getattr(self.session, http_verb, "post")( @@ -66,8 +70,8 @@ start = time.time() r = getattr(self.session, http_verb, "post")( - endpoint, json=params, headers={"Rednerd-API-Key": self.api_key} + url, json=params, headers={"Rednerd-API-Key": self.api_key} ) complete_time = time.time() - start logger.info( @@ -70,7 +74,8 @@ ) complete_time = time.time() - start logger.info( - "Received %s in %.2fms: %s" - % (r.status_code, complete_time * 1000, r.text) + "Redner: Received %s in %.2fms.", + r.status_code, + complete_time * 1000, ) @@ -76,4 +81,5 @@ ) + logger.debug("Redner: Received %s", r.text) try: response = r.json()