diff options
| author | Ken Chen <cken@google.com> | 2023-11-16 03:21:56 +0800 |
|---|---|---|
| committer | Ken Chen <cken@google.com> | 2023-11-16 04:44:52 +0800 |
| commit | eb327b91d310671608c536a12d4d1ede7ffd6f67 (patch) | |
| tree | 464a297bd674caf03294035d6a884695f543588b | |
| parent | a5331b802416bfa426efeaed4ac01395ca529521 (diff) | |
| download | DnsResolver-eb327b91d310671608c536a12d4d1ede7ffd6f67.tar.gz | |
Remove redundant log in setResolverConfiguration
The log of setResolverConfiguration binder interface is printed twice in
both "adb logcat" and "dumpsys netd". Now that all parameters can be
printed by gen_log (b/129732660), the legacy logging for
setResolverConfiguration is no longer needed.
[Without this change]
11-16 02:52:57.877 864 864 I netd :
DnsResolverService::setResolverConfiguration(101, [192.168.1.1], [],
1800, 25, 8, 64, 0, 0, "", [192.168.1.1]) -> (0) (0.3ms)
11-16 02:52:57.877 864 864 I netd :
setResolverConfiguration(ResolverParamsParcel{netId: 101,
sampleValiditySeconds: 1800, successThreshold: 25, minSamples: 8,
maxSamples: 64, baseTimeoutMsec: 0, retryCount: 0, servers:
[192.168.1.1], domains: [], tlsName: , tlsServers: [192.168.1.1],
tlsFingerprints: [], caCertificate: , tlsConnectTimeoutMs: 0,
resolverOptions: (null), transportTypes: [1], meteredNetwork: false,
dohParams: (null)}) <0.39ms>
[With this change]
11-16 03:23:53.098 1011 1149 I netd :
setResolverConfiguration(ResolverParamsParcel{netId: 100,
sampleValiditySeconds: 1800, successThreshold: 25, minSamples: 8,
maxSamples: 64, baseTimeoutMsec: 0, retryCount: 0, servers:
[192.168.1.1], domains: [], tlsName: , tlsServers: [192.168.1.1],
tlsFingerprints: [], caCertificate: , tlsConnectTimeoutMs: 0,
resolverOptions: (null), transportTypes: [1], meteredNetwork: false,
dohParams: (null)}) <0.40ms>
Test: atest
Test: adb logcat; adb dumpsys netd
Change-Id: Ia21b999e37d13e86176e153d9cad5ac6f3256135
| -rw-r--r-- | DnsResolver.cpp | 1 | ||||
| -rw-r--r-- | DnsResolver.h | 2 | ||||
| -rw-r--r-- | DnsResolverService.cpp | 12 |
3 files changed, 0 insertions, 15 deletions
diff --git a/DnsResolver.cpp b/DnsResolver.cpp index 5abfaea6..372252d6 100644 --- a/DnsResolver.cpp +++ b/DnsResolver.cpp @@ -68,7 +68,6 @@ bool verifyCallbacks() { DnsResolver* gDnsResolv = nullptr; ResolverNetdCallbacks gResNetdCallbacks; -netdutils::Log gDnsResolverLog("dnsResolver"); uint64_t gApiLevel = 0; DnsResolver* DnsResolver::getInstance() { diff --git a/DnsResolver.h b/DnsResolver.h index 9c2f3d8c..a3819f15 100644 --- a/DnsResolver.h +++ b/DnsResolver.h @@ -21,7 +21,6 @@ #include "DnsQueryLog.h" #include "ResolverController.h" #include "netd_resolv/resolv.h" -#include "netdutils/Log.h" namespace android { namespace net { @@ -48,7 +47,6 @@ class DnsResolver { extern DnsResolver* gDnsResolv; extern ResolverNetdCallbacks gResNetdCallbacks; -extern netdutils::Log gDnsResolverLog; extern uint64_t gApiLevel; } // namespace net diff --git a/DnsResolverService.cpp b/DnsResolverService.cpp index ee129514..9b399b97 100644 --- a/DnsResolverService.cpp +++ b/DnsResolverService.cpp @@ -199,19 +199,7 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str())); } - // TODO: Remove this log after AIDL gen_log supporting more types, b/129732660 - auto entry = - gDnsResolverLog.newEntry() - .prettyFunction(__PRETTY_FUNCTION__) - .args(resolverParams.netId, resolverParams.servers, resolverParams.domains, - resolverParams.sampleValiditySeconds, resolverParams.successThreshold, - resolverParams.minSamples, resolverParams.maxSamples, - resolverParams.baseTimeoutMsec, resolverParams.retryCount, - resolverParams.tlsName, resolverParams.tlsServers); - int res = gDnsResolv->resolverCtrl.setResolverConfiguration(resolverParams); - gResNetdCallbacks.log(entry.returns(res).withAutomaticDuration().toString().c_str()); - return statusFromErrcode(res); } |