Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[JENKINS-36871, JENKINS-37565] JNLP4-connect implementation and Remot…
…ing 3 (#2492) * [JENKINS-36871] Switch to the new JnlpProtocolHandler based implementation Todo - [ ] Restore the cookie behaviour (but done right this time) - [ ] Perhaps investigate issuing clients with TLS certificates (but would require a UI for managing them) * [JENKINS-36871] License headers and javadocs * [JENKINS-36871] Restore cookie handling * [JENKINS-36871] Integrating Agent discovery components * [JENKINS-36871] Pick up remoting 3.0-SNAPSHOT * [JENKINS-36871] Pick up newer snapshot * [JENKINS-36871] Oleg wants to log an exception that cannot happen
- Loading branch information
Showing
with
502 additions
and 520 deletions.
- +92 −56 core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
- +71 −0 core/src/main/java/jenkins/slaves/IOHubProvider.java
- +38 −52 core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
- +36 −110 core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
- +29 −45 core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
- +29 −89 core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
- +201 −0 core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol4.java
- +0 −22 core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
- +4 −0 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly
- +1 −0 core/src/main/resources/jenkins/slaves/Messages.properties
- +0 −145 core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java
- +1 −1 pom.xml
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,71 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2016, CloudBees, Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
package jenkins.slaves; | ||
|
||
import hudson.Extension; | ||
import hudson.init.Terminator; | ||
import hudson.model.Computer; | ||
import java.io.IOException; | ||
import java.util.logging.Level; | ||
import java.util.logging.Logger; | ||
import org.jenkinsci.remoting.protocol.IOHub; | ||
|
||
/** | ||
* Singleton holder of {@link IOHub} | ||
* | ||
* @since FIXME | ||
*/ | ||
@Extension | ||
public class IOHubProvider { | ||
/** | ||
* Our logger. | ||
*/ | ||
private static final Logger LOGGER = Logger.getLogger(IOHubProvider.class.getName()); | ||
/** | ||
* Our hub. | ||
*/ | ||
private IOHub hub; | ||
|
||
public IOHubProvider() { | ||
try { | ||
hub = IOHub.create(Computer.threadPoolForRemoting); | ||
} catch (IOException e) { | ||
LOGGER.log(Level.SEVERE, "Failed to launch IOHub", e); | ||
this.hub = null; | ||
} | ||
} | ||
|
||
public IOHub getHub() { | ||
return hub; | ||
} | ||
|
||
@Terminator | ||
public void cleanUp() throws IOException { | ||
if (hub != null) { | ||
hub.close(); | ||
hub = null; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.