Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add error details into log #6169

Merged
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
6 changes: 6 additions & 0 deletions superset/assets/spec/javascripts/chart/chartActions_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describe('chart actions', () => {
expect(dispatch.callCount).toBe(4);
expect(fetchMock.calls(MOCK_URL)).toHaveLength(1);
expect(dispatch.args[3][0].type).toBe(actions.CHART_UPDATE_SUCCEEDED);
expect(loggerStub.callCount).toBe(1);

return Promise.resolve();
});
Expand All @@ -95,6 +96,8 @@ describe('chart actions', () => {
// chart update, trigger query, update form data, fail
expect(dispatch.callCount).toBe(4);
expect(dispatch.args[3][0].type).toBe(actions.CHART_UPDATE_TIMEOUT);
expect(loggerStub.callCount).toBe(1);
expect(loggerStub.args[0][1].error_details).toBe('timeout');
setupDefaultFetchMock();

return Promise.resolve();
Expand All @@ -113,6 +116,9 @@ describe('chart actions', () => {
const updateFailedAction = dispatch.args[3][0];
expect(updateFailedAction.type).toBe(actions.CHART_UPDATE_FAILED);
expect(updateFailedAction.queryResponse.error).toBe('misc error');

expect(loggerStub.callCount).toBe(1);
expect(loggerStub.args[0][1].error_details).toBe('misc error');
setupDefaultFetchMock();

return Promise.resolve();
Expand Down
26 changes: 16 additions & 10 deletions superset/assets/src/chart/chartAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,28 @@ export function runQuery(formData, force = false, timeout = 60, key) {
return dispatch(chartUpdateSucceeded(json, key));
})
.catch((response) => {
Logger.append(LOG_ACTIONS_LOAD_CHART, {
slice_id: key,
has_err: true,
datasource: formData.datasource,
start_offset: logStart,
duration: Logger.getTimestamp() - logStart,
});
const appendErrorLog = (errorDetails) => {
Logger.append(LOG_ACTIONS_LOAD_CHART, {
slice_id: key,
has_err: true,
error_details: errorDetails,
datasource: formData.datasource,
start_offset: logStart,
duration: Logger.getTimestamp() - logStart,
});
};

if (response.statusText === 'timeout') {
appendErrorLog('timeout');
return dispatch(chartUpdateTimeout(response.statusText, timeout, key));
} else if (response.name === 'AbortError') {
appendErrorLog('abort');
return dispatch(chartUpdateStopped(key));
}
return getClientErrorObject(response).then(parsedResponse =>
dispatch(chartUpdateFailed(parsedResponse, key)),
);
return getClientErrorObject(response).then((parsedResponse) => {
appendErrorLog(parsedResponse.error);
return dispatch(chartUpdateFailed(parsedResponse, key));
});
});

const annotationLayers = formData.annotation_layers || [];
Expand Down