Fix type error if config loading results in exception (#109)

amphp · Jan 21, 2023 · f528711 · f528711
1 parent 12884f8
commit f528711
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/src/DnsConfigLoader.php b/src/DnsConfigLoader.php
@@ -4,5 +4,8 @@
 
 interface DnsConfigLoader
 {
+    /**
+     * @throws DnsConfigException
+     */
     public function loadConfig(): DnsConfig;
 }
diff --git a/src/Rfc1035StubDnsResolver.php b/src/Rfc1035StubDnsResolver.php
@@ -100,10 +100,7 @@ public function resolve(string $name, ?int $typeRestriction = null, ?Cancellatio
             default => throw new \Error("Invalid value for parameter 2: null|Record::A|Record::AAAA expected"),
         };
 
-        if ($this->configStatus === self::CONFIG_NOT_LOADED) {
-            $this->reloadConfig();
-        }
-
+        $this->loadConfigIfNotLoaded();
         if ($this->configStatus === self::CONFIG_FAILED) {
             return $this->blockingFallbackResolver->resolve($name, $typeRestriction, $cancellation);
         }
@@ -218,6 +215,8 @@ public function resolve(string $name, ?int $typeRestriction = null, ?Cancellatio
      * Reloads the configuration in the background.
      *
      * Once it's finished, the configuration will be used for new requests.
+     *
+     * @throws DnsConfigException
      */
     public function reloadConfig(): DnsConfig
     {
@@ -232,29 +231,11 @@ public function reloadConfig(): DnsConfig
             } catch (DnsConfigException $e) {
                 $this->configStatus = self::CONFIG_FAILED;
 
-                $message = "Could not load the system's DNS configuration; "
-                    . "falling back to synchronous, blocking resolver; "
-                    . \get_class($e) . ": " . $e->getMessage();
-
-                try {
-                    \trigger_error(
-                        $message,
-                        \E_USER_WARNING
-                    );
-                } catch (\Throwable) {
-                    \set_error_handler(null);
-                    \trigger_error(
-                        $message,
-                        \E_USER_WARNING
-                    );
-                    \restore_error_handler();
-                }
+                throw $e;
             } finally {
                 $this->pendingConfig = null;
             }
 
-            \assert($this->config !== null);
-
             return $this->config;
         });
 
@@ -271,10 +252,7 @@ public function query(string $name, int $type, ?Cancellation $cancellation = nul
 
         $future = async(function () use ($name, $type, $cancellation): array {
             try {
-                if ($this->configStatus === self::CONFIG_NOT_LOADED) {
-                    $this->reloadConfig();
-                }
-
+                $this->loadConfigIfNotLoaded();
                 if ($this->configStatus === self::CONFIG_FAILED) {
                     return $this->blockingFallbackResolver->query($name, $type, $cancellation);
                 }
@@ -558,4 +536,33 @@ private function shouldRetry(int|string $code): bool
             MessageResponseCodes::NAME_ERROR,
         ], true);
     }
+
+    private function loadConfigIfNotLoaded(): void
+    {
+        if ($this->configStatus !== self::CONFIG_NOT_LOADED) {
+            return;
+        }
+
+        try {
+            $this->reloadConfig();
+        } catch (DnsConfigException $e) {
+            $message = "Could not load the system's DNS configuration; "
+                . "falling back to synchronous, blocking resolver; "
+                . \get_class($e) . ": " . $e->getMessage();
+
+            try {
+                \trigger_error(
+                    $message,
+                    \E_USER_WARNING
+                );
+            } catch (\Throwable) {
+                \set_error_handler(null);
+                \trigger_error(
+                    $message,
+                    \E_USER_WARNING
+                );
+                \restore_error_handler();
+            }
+        }
+    }
 }