From 8adbceec8c0d4d8f059ecb671c25d6501310babd Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Mon, 12 Oct 2020 21:47:02 +0000 Subject: [PATCH] Fix searches that produce no results --- irclog.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irclog.py b/irclog.py index 5dd4bd1..86221aa 100644 --- a/irclog.py +++ b/irclog.py @@ -927,7 +927,7 @@ class WebServer: date = f'{d:%Y-%m-%d }' if withDate else '' lineId = hashlib.md5(f'{ts} {command} {content}'.encode('utf-8')).hexdigest()[:8] ret.append(f'{date}{d:%H:%M:%S}{html.escape(content)}') - return '\n' + '\n'.join(ret) + '\n
' + return '\n' + '\n'.join(ret) + '\n
' if ret else '' async def get_log(self, request): self.logger.info(f'Received request {id(request)} from {request.remote!r} for {request.path!r}') @@ -1047,7 +1047,7 @@ class WebServer: return aiohttp.web.HTTPInternalServerError() stdout, incomplete = stdoutTask.result() self.logger.info(f'Request {id(request)} grep exited with {proc.returncode} and produced {len(stdout)} bytes (incomplete: {incomplete})') - if proc.returncode != 0: + if proc.returncode not in (0, 1): incomplete = True lines = self._raw_to_lines(self._stdout_with_path(stdout)) return aiohttp.web.Response( @@ -1060,7 +1060,7 @@ class WebServer: '', '', '

Warning: output incomplete due to exceeding time or size limits

' if incomplete else '', - self._render_log(lines, withDate = True), + self._render_log(lines, withDate = True) or 'No results.', '', '' ]),