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

Improve logging in DnsServerAddressStreamProviders (#10848)

Browse Source 
Motivation:

`DnsServerAddressStreamProviders` tries to load `MacOSDnsServerAddressStreamProvider`
on macOS. However, it doesn't warn users when `MacOSDnsServerAddressStreamProvider`
is not awailable, which may cause incorrect results for DNS resolutions.

Modifications:

- Log at warn level if `MacOSDnsServerAddressStreamProvider` is not found on macOS;
- Log at debug level when `MacOSDnsServerAddressStreamProvider` is loaded and available;

Result:

macOS users are notified when `MacOSDnsServerAddressStreamProvider` is not available.
This commit is contained in:
Idel Pivnitskiy 2020-12-10 05:19:39 -08:00 committed by Norman Maurer
parent 6df3adfb9b
commit 643b8471e2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProviders.java
View File

@ -23,7 +23,6 @@ import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType; import java.lang.invoke.MethodType;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -37,6 +36,8 @@ public final class DnsServerAddressStreamProviders {
private static final InternalLogger LOGGER = private static final InternalLogger LOGGER =
InternalLoggerFactory.getInstance(DnsServerAddressStreamProviders.class); InternalLoggerFactory.getInstance(DnsServerAddressStreamProviders.class);
private static final MethodHandle STREAM_PROVIDER_CONSTRUCTOR_HANDLE; private static final MethodHandle STREAM_PROVIDER_CONSTRUCTOR_HANDLE;
private static final String MACOS_PROVIDER_CLASS_NAME =
"io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider";
static { static {
MethodHandle constructorHandle = null; MethodHandle constructorHandle = null;
@ -47,7 +48,7 @@ public final class DnsServerAddressStreamProviders {
Object maybeProvider = AccessController.doPrivileged((PrivilegedAction<Object>) () -> { Object maybeProvider = AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
try { try {
return Class.forName( return Class.forName(
"io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider", MACOS_PROVIDER_CLASS_NAME,
true, true,
DnsServerAddressStreamProviders.class.getClassLoader()); DnsServerAddressStreamProviders.class.getClassLoader());
} catch (Throwable cause) { } catch (Throwable cause) {
@ -58,18 +59,17 @@ public final class DnsServerAddressStreamProviders {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Class<? extends DnsServerAddressStreamProvider> providerClass = Class<? extends DnsServerAddressStreamProvider> providerClass =
(Class<? extends DnsServerAddressStreamProvider>) maybeProvider; (Class<? extends DnsServerAddressStreamProvider>) maybeProvider;
MethodHandles.Lookup lookup = MethodHandles.lookup(); MethodHandles.Lookup lookup = MethodHandles.lookup();
Method method = providerClass.getMethod("ensureAvailability");
method.invoke(null);
constructorHandle = lookup.findConstructor(providerClass, MethodType.methodType(void.class)); constructorHandle = lookup.findConstructor(providerClass, MethodType.methodType(void.class));
constructorHandle.invoke(); constructorHandle.invoke(); // ctor ensures availability
} else if (!(maybeProvider instanceof ClassNotFoundException)) { LOGGER.debug("{}: available", MACOS_PROVIDER_CLASS_NAME);
} else {
throw (Throwable) maybeProvider; throw (Throwable) maybeProvider;
} }
} catch (Throwable cause) { } catch (Throwable cause) {
LOGGER.debug( LOGGER.warn(
"Unable to use MacOSDnsServerAddressStreamProvider, fallback to system defaults", cause); "Unable to load {}, fallback to system defaults. {}", MACOS_PROVIDER_CLASS_NAME,
"This may result in incorrect DNS resolutions on MacOS.", cause);
constructorHandle = null; constructorHandle = null;
} }
} }