inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #919 from Alfresco/fix/SEARCH-2401_HttpSocketTimeOut

Browse Source 
SEARCH-2401: Add socketTimeOut parameter to HttpConnections
(cherry picked from commit cb64ba034c727b108e4588e39615ca6b1f36db67)
This commit is contained in:
Angel Borroy
2020-12-03 11:22:53 +00:00
committed by Tom Page
parent 584ce2e672
commit 8e6ac4f7dc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+8 -1
View File
@@ -4091,7 +4091,14 @@ public class SolrInformationServer implements InformationServer
}
catch (Exception exception)
{
LOGGER.error("Unable to get nodes metadata from repository. See the stacktrace below for further details.", exception);
LOGGER.error("Unable to get nodes metadata from repository using "
+ "fromNodeId=" + parameters.getFromNodeId() + ", "
+ "toNodeId=" + parameters.getToNodeId() + ", "
+ "nodeIds=" + parameters.getNodeIds() + ", "
+ "fromTxId=" + parameters.getFromTxnId() + ", "
+ "toTxId=" + parameters.getToTxnId() + ", "
+ "txIds=" + parameters.getTransactionIds()
+ ". See the stacktrace below for further details.", exception);
return empty();
}
}
search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
+3 -2
View File
@@ -195,7 +195,7 @@ public class SOLRAPIClientFactory
else
{
httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections,
maxHostConnections);
maxHostConnections, socketTimeout);
}
AlfrescoHttpClient repoClient = httpClientFactory.getRepoClient(alfrescoHost, alfrescoPortSSL);
@@ -235,13 +235,14 @@ public class SOLRAPIClientFactory
*/
class PlainHttpClientFactory extends HttpClientFactory
{
public PlainHttpClientFactory(String host, int port, int maxTotalConnections, int maxHostConnections)
public PlainHttpClientFactory(String host, int port, int maxTotalConnections, int maxHostConnections, int socketTimeout)
{
setSecureCommsType("none");
setHost(host);
setPort(port);
setMaxTotalConnections(maxTotalConnections);
setMaxHostConnections(maxHostConnections);
setSocketTimeout(socketTimeout);
init();
}