andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support preloading of tcnative share lib

Browse Source 
Motivation:

Some applications may use alternative methods of loading the tcnative JNI symbols. We should support this use case.

Modifications:

Separate the loading and initialzation of the tcnative library so that each can fail independently.

Result:

Fixes #5043
This commit is contained in:
nmittler 2016-04-11 09:06:48 -07:00
parent 572bdfb494
commit 379ad2c02e
1 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
handler/src/main/java/io/netty/handler/ssl/OpenSsl.java
View File

@ -61,29 +61,30 @@ public final class OpenSsl {
// If in the classpath, try to load the native library and initialize netty-tcnative. // If in the classpath, try to load the native library and initialize netty-tcnative.
if (cause == null) { if (cause == null) {
try { try {
String os = normalizeOs(SystemPropertyUtil.get("os.name", "")); // The JNI library was not already loaded. Load it now.
String arch = normalizeArch(SystemPropertyUtil.get("os.arch", "")); loadTcNative();
Set<String> libNames = new LinkedHashSet<String>(3);
// First, try loading the platform-specific library. Platform-specific
// libraries will be available if using a tcnative uber jar.
libNames.add("netty-tcnative-" + os + '-' + arch);
if (LINUX.equalsIgnoreCase(os)) {
// Fedora SSL lib so naming (libssl.so.10 vs libssl.so.1.0.0)..
libNames.add("netty-tcnative-" + os + '-' + arch + "-fedora");
}
// finally the default library.
libNames.add("netty-tcnative");
NativeLibraryLoader.loadFirstAvailable(SSL.class.getClassLoader(),
libNames.toArray(new String[libNames.size()]));
Library.initialize("provided");
SSL.initialize(null);
} catch (Throwable t) { } catch (Throwable t) {
cause = t; cause = t;
logger.debug( logger.debug(
"Failed to load netty-tcnative; " + "Failed to load netty-tcnative; " +
OpenSslEngine.class.getSimpleName() + " will be unavailable, unless the " +
"application has already loaded the symbols by some other means. " +
"See http://netty.io/wiki/forked-tomcat-native.html for more information.", t);
}
try {
initializeTcNative();
// The library was initialized successfully. If loading the library failed above,
// reset the cause now since it appears that the library was loaded by some other
// means.
cause = null;
} catch (Throwable t) {
if (cause == null) {
cause = t;
}
logger.debug(
"Failed to initialize netty-tcnative; " +
OpenSslEngine.class.getSimpleName() + " will be unavailable. " + OpenSslEngine.class.getSimpleName() + " will be unavailable. " +
"See http://netty.io/wiki/forked-tomcat-native.html for more information.", t); "See http://netty.io/wiki/forked-tomcat-native.html for more information.", t);
} }
@ -219,6 +220,30 @@ public final class OpenSsl {
private OpenSsl() { } private OpenSsl() { }
private static void loadTcNative() throws Exception {
String os = normalizeOs(SystemPropertyUtil.get("os.name", ""));
String arch = normalizeArch(SystemPropertyUtil.get("os.arch", ""));
Set<String> libNames = new LinkedHashSet<String>(3);
// First, try loading the platform-specific library. Platform-specific
// libraries will be available if using a tcnative uber jar.
libNames.add("netty-tcnative-" + os + '-' + arch);
if (LINUX.equalsIgnoreCase(os)) {
// Fedora SSL lib so naming (libssl.so.10 vs libssl.so.1.0.0)..
libNames.add("netty-tcnative-" + os + '-' + arch + "-fedora");
}
// finally the default library.
libNames.add("netty-tcnative");
NativeLibraryLoader.loadFirstAvailable(SSL.class.getClassLoader(),
libNames.toArray(new String[libNames.size()]));
}
private static void initializeTcNative() throws Exception {
Library.initialize("provided");
SSL.initialize(null);
}
private static String normalizeOs(String value) { private static String normalizeOs(String value) {
value = normalize(value); value = normalize(value);
if (value.startsWith("aix")) { if (value.startsWith("aix")) {