Merge branch 'main' into fix-exception-not-foud

Author: ilyakharev

CHANGELOG.md

@@ -1,4 +1,6 @@
-* add class exist check in RequestTrait
+
+* fixed discovery on exception
+* fixed logger in EnvironCredentials
 
 # 1.8.1
 

src/Auth/EnvironCredentials.php

@@ -37,4 +37,14 @@ public function getName(): string
     {
         return $this->auth->getName();
     }
+
+    public function logger()
+    {
+        return $this->auth->logger();
+    }
+
+    public function setLogger($logger)
+    {
+        $this->auth->setLogger($logger);
+    }
 }

src/Traits/RequestTrait.php

@@ -179,7 +179,7 @@ protected function handleGrpcStatus($service, $method, $status)
                 }catch (\Exception $e){}
             }
             $endpoint = $this->ydb->endpoint();
-            if ($this->ydb->needDiscovery()){
+            if ($this->ydb->needDiscovery() && count($this->ydb->cluster()->all()) > 0){
                 $endpoint = $this->ydb->cluster()->all()[array_rand($this->ydb->cluster()->all())]->endpoint();
             }
             $this->client = new $this->client($endpoint,[

src/Ydb.php

@@ -107,20 +107,24 @@ public function __construct($config = [], LoggerInterface $logger = null)
             $this->logger = new NullLogger();
         }
 
+        $this->retry = new Retry($this->logger);
+
         if(isset($config['credentials'])){
             $this->iam_config['credentials'] = $config['credentials'];
             $config['credentials']->setLogger($this->logger());
         }
 
         if (!empty($config['discovery']))
         {
+            $this->discover = true;
             if (isset($config['discoveryInterval'])){
                 $this->discoveryInterval = $config['discoveryInterval'];
             }
-            $this->discover();
-        }
 
-        $this->retry = new Retry($this->logger);
+            $this->retry(function (){
+                $this->discover();
+            }, true);
+        }
 
         $this->logger()->info('YDB: Initialized');
     }