X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9cb9b670d182932851613ac8a08d3a1e7c8ce51f..4f5f5ea8fc3fc640110aaf379d6500fd5854ea6d:/nominatim/api/logging.py?ds=sidebyside diff --git a/nominatim/api/logging.py b/nominatim/api/logging.py index d4dc68b7..37ae7f5f 100644 --- a/nominatim/api/logging.py +++ b/nominatim/api/logging.py @@ -109,7 +109,6 @@ class BaseLogger: # quoted correctly. sqlstr = re.sub(r'%(?!\()', '%%', sqlstr) sqlstr = re.sub(r'__\[POSTCOMPILE_([^]]*)\]', r'%(\1)s', sqlstr) - print(sqlstr) return sqlstr % params class HTMLLogger(BaseLogger): @@ -236,6 +235,10 @@ class TextLogger(BaseLogger): self.buffer = io.StringIO() + def _timestamp(self) -> None: + self._write(f'[{dt.datetime.now()}]\n') + + def get_buffer(self) -> str: return self.buffer.getvalue() @@ -248,6 +251,7 @@ class TextLogger(BaseLogger): def section(self, heading: str) -> None: + self._timestamp() self._write(f"\n# {heading}\n\n") @@ -284,6 +288,7 @@ class TextLogger(BaseLogger): def result_dump(self, heading: str, results: Iterator[Tuple[Any, Any]]) -> None: + self._timestamp() self._write(f'{heading}:\n') total = 0 for rank, res in results: @@ -299,6 +304,7 @@ class TextLogger(BaseLogger): def sql(self, conn: AsyncConnection, statement: 'sa.Executable', params: Union[Mapping[str, Any], Sequence[Mapping[str, Any]], None]) -> None: + self._timestamp() sqlstr = '\n| '.join(textwrap.wrap(self.format_sql(conn, statement, params), width=78)) self._write(f"| {sqlstr}\n\n")