Skip to content

Commit b3543a7

Browse files
committed
catchign right code
Signed-off-by: abbyhu2000 <[email protected]>
1 parent 4dc2f7e commit b3543a7

File tree

8 files changed

+26
-5
lines changed

8 files changed

+26
-5
lines changed

src/core/public/http/intercept.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ export async function interceptResponse(
115115
checkHalt(controller, error);
116116

117117
if (!interceptor.responseError) {
118+
console.log('interceptor.responseError', error);
118119
throw error;
119120
}
120121

src/plugins/data/common/data_frames/types.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ export interface IDataFrameResponse extends SearchResponse<any> {
105105
took: number;
106106
}
107107

108+
export interface IDataFrameResponseError {
109+
status: number;
110+
message: string;
111+
}
112+
108113
export interface IDataFrameError extends IDataFrameResponse {
109114
error: Error;
110115
}

src/plugins/data/public/search/fetch/handle_response.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ import { getNotifications } from '../../services';
3838
import { SearchRequest } from '..';
3939

4040
export function handleResponse(request: SearchRequest, response: SearchResponse<any>) {
41+
if (response.cakecakecakecakecake) {
42+
console.log('cakecakecakecakecake', response);
43+
}
4144
if (response.timed_out) {
4245
getNotifications().toasts.addWarning({
4346
title: i18n.translate('data.search.searchSource.fetch.requestTimedOutNotificationMessage', {

src/plugins/discover/public/application/view_components/utils/use_search.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ export const useSearch = (services: DiscoverViewServices) => {
226226
rows: [],
227227
});
228228

229+
console.log('error', error);
230+
229231
data.search.showError(error as Error);
230232
} finally {
231233
initalSearchComplete.current = true;

src/plugins/query_enhancements/common/utils.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ export const fetch = (context: EnhancedFetchContext, query: Query, aggConfig?: Q
135135
body,
136136
signal,
137137
})
138+
).pipe(
139+
catchError((error) => {
140+
console.log('fetch error', error.message);
141+
// Handle the error as needed, e.g., rethrow, return a default value, etc.
142+
throw error; // Rethrow the error if you want it to propagate
143+
})
138144
);
139145
};
140146

src/plugins/query_enhancements/public/search/ppl_search_interceptor.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ export class PPLSearchInterceptor extends SearchInterceptor {
5454

5555
return fetch(context, query, this.getAggConfig(searchRequest, query)).pipe(
5656
catchError((error) => {
57+
console.log('search interceptor error', error);
5758
return throwError(error);
5859
})
5960
);

src/plugins/query_enhancements/server/routes/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { ISearchStrategy } from '../../../data/server';
1515
import { API, SEARCH_STRATEGY } from '../../common';
1616
import { registerQueryAssistRoutes } from './query_assist';
1717
import { registerDataSourceConnectionsRoutes } from './data_source_connection';
18+
import { instance } from '../../../console/public/application/contexts/editor_context/editor_registry';
1819

1920
/**
2021
* Defines a route for a specific search strategy.
@@ -85,10 +86,9 @@ function defineRoute(
8586
);
8687
return res.ok({ body: { ...queryRes } });
8788
} catch (err) {
88-
logger.error(err);
8989
return res.custom({
90-
statusCode: err.status ?? 500,
91-
body: err,
90+
statusCode: err.name,
91+
body: err.message,
9292
});
9393
}
9494
}

src/plugins/query_enhancements/server/search/ppl_search_strategy.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
DATA_FRAME_TYPES,
1111
IDataFrameError,
1212
IDataFrameResponse,
13+
IDataFrameResponseError,
1314
IDataFrameWithAggs,
1415
IOpenSearchDashboardsSearchRequest,
1516
Query,
@@ -41,7 +42,9 @@ export const pplSearchStrategyProvider = (
4142
const rawResponse: any = await pplFacet.describeQuery(context, request);
4243

4344
if (!rawResponse.success) {
44-
throw new Error(rawResponse.data.body);
45+
const error = new Error(rawResponse.data.body);
46+
error.name = rawResponse.data.status;
47+
throw error;
4548
}
4649

4750
const dataFrame = createDataFrame({
@@ -75,7 +78,7 @@ export const pplSearchStrategyProvider = (
7578
took: rawResponse.took,
7679
} as IDataFrameResponse;
7780
} catch (e) {
78-
logger.error(`pplSearchStrategy: ${e.message}`);
81+
logger.error(`pplSearchStrategy: ${e}`);
7982
if (usage) usage.trackError();
8083
throw e;
8184
}

0 commit comments

Comments
 (0)