Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/server/_printer.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def gen():
if r is not None:
yield r
except Exception as e:
app.logger.error(f"error executing")
app.logger.exception(f"error executing: {str(e)}")
self.result = -1
yield self._error(e)

Expand Down Expand Up @@ -81,7 +81,7 @@ def _begin(self) -> Optional[Union[str, bytes]]:

def _error(self, error: Exception) -> str:
# send an generic error
return dumps(dict(result=self.result, message=f"unknown error occurred: {error}", error=error, epidata=[]))
return dumps(dict(result=self.result, message=f"unknown error occurred: {error}", error=str(error), epidata=[]))

def _print_row(self, row: Dict) -> Optional[Union[str, bytes]]:
first = self.count == 0
Expand Down
8 changes: 4 additions & 4 deletions src/server/endpoints/signal_dashboard_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ def handle():

p = create_printer()

def gen(rows):
coverage_data = fetch_coverage_data()
def gen(rows, coverage_data):
for row in rows:
parsed = parse_row(row, fields_string, fields_int, fields_float)
# inject coverage data
parsed['coverage'] = coverage_data.get(parsed['name'], {})
parsed["coverage"] = coverage_data.get(parsed["name"], {})
yield parsed

try:
coverage_data = fetch_coverage_data()
r = run_query(p, (query, {}))
except Exception as e:
raise DatabaseErrorException(str(e))

# now use a generator for sending the rows and execute all the other queries
return p(gen(r))
return p(gen(r, coverage_data))