You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2016/09/13 01:02:11 UTC
[1/2] archiva git commit: Increasing timeouts for repository check
Repository: archiva
Updated Branches:
refs/heads/master 6db703ff9 -> cae55ace9
Increasing timeouts for repository check
Slow responding repositories were marked with a repository failure because of the
low read timeout value.
Increases the timeout for the repository check.
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/02b89279
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/02b89279
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/02b89279
Branch: refs/heads/master
Commit: 02b892796c31000e93ad0727234133a789e9a894
Parents: a746721
Author: Martin Stockhammer <m....@web.de>
Authored: Thu Sep 8 19:00:40 2016 +0200
Committer: Martin Stockhammer <m....@web.de>
Committed: Thu Sep 8 19:00:40 2016 +0200
----------------------------------------------------------------------
.../DefaultRemoteRepositoriesService.java | 25 +++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/02b89279/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
index c3528eb..9c0bdd9 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
@@ -64,6 +64,9 @@ public class DefaultRemoteRepositoriesService
@Inject
private NetworkProxyAdmin networkProxyAdmin;
+ int checkReadTimeout = 10000;
+ int checkTimeout = 9000;
+
@Override
public List<RemoteRepository> getRemoteRepositories()
throws ArchivaRestServiceException
@@ -172,14 +175,14 @@ public class DefaultRemoteRepositoriesService
.networkProxy( networkProxy ) );
// hardcoded value as it's a check of the remote repo connectivity
- wagon.setReadTimeout( 4000 );
- wagon.setTimeout( 3000 );
+ wagon.setReadTimeout( checkReadTimeout );
+ wagon.setTimeout( checkTimeout );
if ( wagon instanceof AbstractHttpClientWagon )
{
HttpMethodConfiguration httpMethodConfiguration = new HttpMethodConfiguration() //
.setUsePreemptive( true ) //
- .setReadTimeout( 4000 );
+ .setReadTimeout( checkReadTimeout );
HttpConfiguration httpConfiguration = new HttpConfiguration().setGet( httpMethodConfiguration );
AbstractHttpClientWagon.class.cast( wagon ).setHttpConfiguration( httpConfiguration );
}
@@ -214,4 +217,20 @@ public class DefaultRemoteRepositoriesService
}
}
+
+ public int getCheckReadTimeout() {
+ return checkReadTimeout;
+ }
+
+ public void setCheckReadTimeout(int checkReadTimeout) {
+ this.checkReadTimeout = checkReadTimeout;
+ }
+
+ public int getCheckTimeout() {
+ return checkTimeout;
+ }
+
+ public void setCheckTimeout(int checkTimeout) {
+ this.checkTimeout = checkTimeout;
+ }
}
[2/2] archiva git commit: Merge branch 'pr/23' [MRM-1924] merge pull request
Posted by ol...@apache.org.
Merge branch 'pr/23'
[MRM-1924]�merge pull request
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/cae55ace
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/cae55ace
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/cae55ace
Branch: refs/heads/master
Commit: cae55ace9ff82bf55aec318e237ba9768ccc940f
Parents: 6db703f 02b8927
Author: olivier lamy <ol...@apache.org>
Authored: Tue Sep 13 10:59:55 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Sep 13 10:59:55 2016 +1000
----------------------------------------------------------------------
.../DefaultRemoteRepositoriesService.java | 25 +++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------