diff --git a/AK/Debug.h.in b/AK/Debug.h.in index 1f4ac87a0c7..dba7d0bb6e2 100644 --- a/AK/Debug.h.in +++ b/AK/Debug.h.in @@ -50,6 +50,10 @@ # cmakedefine01 CSS_TRANSITIONS_DEBUG #endif +#ifndef DNS_DEBUG +# cmakedefine01 DNS_DEBUG +#endif + #ifndef EDITOR_DEBUG # cmakedefine01 EDITOR_DEBUG #endif diff --git a/Libraries/LibDNS/Resolver.h b/Libraries/LibDNS/Resolver.h index 6d2fb52e2b3..2a7747dba57 100644 --- a/Libraries/LibDNS/Resolver.h +++ b/Libraries/LibDNS/Resolver.h @@ -51,10 +51,10 @@ public: for (size_t i = 0; i < m_cached_records.size();) { auto& record = m_cached_records[i]; if (record.expiration.has_value() && record.expiration.value() < now) { - dbgln("DNS: Removing expired record for {}", m_name.to_string()); + dbgln_if(DNS_DEBUG, "DNS: Removing expired record for {}", m_name.to_string()); m_cached_records.remove(i); } else { - dbgln("DNS: Keeping record for {} (expires in {})", m_name.to_string(), record.expiration.has_value() ? record.expiration.value().to_string() : "never"_string); + dbgln_if(DNS_DEBUG, "DNS: Keeping record for {} (expires in {})", m_name.to_string(), record.expiration.has_value() ? record.expiration.value().to_string() : "never"_string); ++i; } } @@ -157,7 +157,7 @@ public: { auto result = lookup_in_cache(name, class_, desired_types); VERIFY(!result.is_null()); - dbgln("DNS::expect({}) -> OK", name); + dbgln_if(DNS_DEBUG, "DNS::expect({}) -> OK", name); return *result; } @@ -204,7 +204,7 @@ public: if (!has_connection()) { // Use system resolver // FIXME: Use an underlying resolver instead. - dbgln("Not ready to resolve, using system resolver and skipping cache for {}", name); + dbgln_if(DNS_DEBUG, "Not ready to resolve, using system resolver and skipping cache for {}", name); auto record_or_error = Core::Socket::resolve_host(name, Core::Socket::SocketType::Stream); if (record_or_error.is_error()) { promise->reject(record_or_error.release_error()); @@ -305,7 +305,7 @@ public: return nullptr; }); if (cached_entry) { - dbgln("DNS::lookup({}) -> Already in cache", name); + dbgln_if(DNS_DEBUG, "DNS::lookup({}) -> Already in cache", name); return cached_entry.release_nonnull(); } @@ -364,7 +364,7 @@ private: auto message_or_err = parse_one_message(); if (message_or_err.is_error()) { if (!message_or_err.error().is_errno() || message_or_err.error().code() != EAGAIN) - dbgln("Failed to receive message: {}", message_or_err.error()); + dbgln("DNS: Failed to receive message: {}", message_or_err.error()); break; } @@ -386,7 +386,7 @@ private: return {}; }); if (result.is_error()) { - dbgln("Received a message with no pending lookup: {}", result.error()); + dbgln_if(DNS_DEBUG, "DNS: Received a message with no pending lookup: {}", result.error()); continue; } } @@ -401,7 +401,7 @@ private: TemporaryChange change(m_attempting_restart, true); auto create_result = m_create_socket(); if (create_result.is_error()) { - dbgln("Failed to create socket: {}", create_result.error()); + dbgln_if(DNS_DEBUG, "DNS: Failed to create socket: {}", create_result.error()); return false; } diff --git a/Meta/CMake/all_the_debug_macros.cmake b/Meta/CMake/all_the_debug_macros.cmake index 79cb40082af..da83274de72 100644 --- a/Meta/CMake/all_the_debug_macros.cmake +++ b/Meta/CMake/all_the_debug_macros.cmake @@ -8,6 +8,7 @@ set(CSS_LOADER_DEBUG ON) set(CSS_PARSER_DEBUG ON) set(CSS_TOKENIZER_DEBUG ON) set(CSS_TRANSITIONS_DEBUG ON) +set(DNS_DEBUG ON) set(EDITOR_DEBUG ON) set(EMOJI_DEBUG ON) set(FILE_WATCHER_DEBUG ON)