QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

add error details into log (#6169)

Browse Source
This commit is contained in:
Grace Guo
2018-10-25 13:52:47 -07:00
committed by GitHub
parent e21e6a7600
commit 9c5fc42fee
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
superset/assets/spec/javascripts/chart/chartActions_spec.js
View File

@@ -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();
});
@@ -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();
@@ -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();

26
superset/assets/src/chart/chartAction.js
View File

@@ -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 || [];