[courier] remove use of esShardTimeout, see #8544

This commit is contained in:
spalger 2016-10-04 16:26:48 -07:00
parent a1e62ef048
commit 5a81f53306
2 changed files with 4 additions and 14 deletions

View file

@ -7,25 +7,16 @@ import SearchRequestProvider from '../fetch/request/search';
import SegmentedRequestProvider from '../fetch/request/segmented';
import SearchStrategyProvider from '../fetch/strategy/search';
export default function SearchSourceFactory(Promise, Private, config, esShardTimeout) {
export default function SearchSourceFactory(Promise, Private, config) {
let SourceAbstract = Private(AbstractDataSourceProvider);
let SearchRequest = Private(SearchRequestProvider);
let SegmentedRequest = Private(SegmentedRequestProvider);
let searchStrategy = Private(SearchStrategyProvider);
let normalizeSortRequest = Private(NormalizeSortRequestProvider);
function includeDefaults(initialState) {
return defaults(
initialState || {},
{
timeout: esShardTimeout
}
);
}
_.class(SearchSource).inherits(SourceAbstract);
function SearchSource(initialState) {
SearchSource.Super.call(this, includeDefaults(initialState), searchStrategy);
SearchSource.Super.call(this, initialState, searchStrategy);
}
/*****
@ -47,8 +38,7 @@ export default function SearchSourceFactory(Promise, Private, config, esShardTim
'aggs',
'from',
'size',
'source',
'timeout'
'source'
];
SearchSource.prototype.index = function (indexPattern) {

View file

@ -4,7 +4,7 @@ import IsRequestProvider from './is_request';
import MergeDuplicatesRequestProvider from './merge_duplicate_requests';
import ReqStatusProvider from './req_status';
export default function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) {
export default function CourierFetchCallClient(Private, Promise, es) {
const isRequest = Private(IsRequestProvider);
const mergeDuplicateRequests = Private(MergeDuplicatesRequestProvider);