OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 04:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remote build result submission shouldn't hang forever even if Hudson goes down.

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28175 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2010-03-03 16:49:20 +00:00
1 parent c6acb5b8d5
commit 6312340189
1 file changed
+19 -3
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/Main.java
+19 -3
View File
@@ -30,6 +30,7 @@ import com.thoughtworks.xstream.core.util.Base64Encoder;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.HttpRetryException;
@@ -86,7 +87,7 @@ public class Main {
if(auth != null) auth = "Basic " + new Base64Encoder().encode(auth.getBytes("UTF-8"));
{// check if the home is set correctly
HttpURLConnection con = (HttpURLConnection)new URL(home).openConnection();
HttpURLConnection con = open(new URL(home));
if (auth != null) con.setRequestProperty("Authorization", auth);
con.connect();
if(con.getResponseCode()!=200
@@ -99,7 +100,7 @@ public class Main {
String projectNameEnc = URLEncoder.encode(projectName,"UTF-8").replaceAll("\\+","%20");
{// check if the job name is correct
HttpURLConnection con = (HttpURLConnection)new URL(home+"job/"+projectNameEnc+"/acceptBuildResult").openConnection();
HttpURLConnection con = open(new URL(home+"job/"+projectNameEnc+"/acceptBuildResult"));
if (auth != null) con.setRequestProperty("Authorization", auth);
con.connect();
if(con.getResponseCode()!=200) {
@@ -136,7 +137,7 @@ public class Main {
while(true) {
try {
// start a remote connection
HttpURLConnection con = (HttpURLConnection) new URL(location).openConnection();
HttpURLConnection con = open(new URL(location));
if (auth != null) con.setRequestProperty("Authorization", auth);
con.setDoOutput(true);
// this tells HttpURLConnection not to buffer the whole thing
@@ -167,8 +168,23 @@ public class Main {
}
}
/**
* Connects to the given HTTP URL and configure time out, to avoid infinite hang.
*/
private static HttpURLConnection open(URL url) throws IOException {
HttpURLConnection c = (HttpURLConnection)url.openConnection();
c.setReadTimeout(TIMEOUT);
c.setConnectTimeout(TIMEOUT);
return c;
}
/**
* Set to true if we are running unit tests.
*/
public static boolean isUnitTest = false;
/**
* Time out for socket connection to Hudson.
*/
public static final int TIMEOUT = Integer.getInteger(Main.class.getName()+".timeout",15000);
}