Merge pull request #7 from Xelon-AG/develop

Develop
Xelon-AG · Nov 30, 2022 · 9a80f81 · 9a80f81
2 parents 10e6cda + af8fb76
commit 9a80f81
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/src/Requests/ApiRequest.php b/src/Requests/ApiRequest.php
@@ -35,7 +35,7 @@ private function request(string $method, string $uri, array $options = [])
         } catch (ClientException $e) {
             // if 401, create new session and reply attempt
         } catch (\Exception $e) {
-            Log::error('Rest api exception : '.$e->getMessage());
+            Log::error('Rest api exception: '.$e->getMessage());
         }
     }
 

diff --git a/src/Requests/SoapRequest.php b/src/Requests/SoapRequest.php
@@ -43,8 +43,8 @@ public function request(string $method, array $requestBody, bool $convertToSoap
                 property_exists($this->soapClient, '__last_request')
                     ? "\nSOAP response start***: ".$this->soapClient->__last_response.'***SOAP response end'
                     : ''
-            ).
-                "\nTrace: ".json_encode($exception->getTrace());
+            );
+            // "\nTrace: ".json_encode($exception->getTrace());
 
             Log::error($message);
             throw new \Exception($message);

diff --git a/src/Traits/Soap/SoapVmApis.php b/src/Traits/Soap/SoapVmApis.php
@@ -42,6 +42,12 @@ public function getObjectInfo(string $objectId, string $objectType, string $path
             }
         }
 
+        if (! isset($result->returnval->propSet)) {
+            Log::error('Get object info error: '.json_encode($result));
+
+            return new \stdClass();
+        }
+
         return $pathSet
             ? ($result->returnval->propSet->val ?? null)
             : $this->transformPropSet($result->returnval->propSet);

diff --git a/src/Transform/SoapTransform.php b/src/Transform/SoapTransform.php
@@ -105,6 +105,7 @@ public function transformToArrayValues(stdClass $object, int $startIndex = 0, ?i
             ['returnval', 'sampleInfo'],
             ['returnval', 'value', 'value'],
             ['returnval', 'config', 'consumerId'],
+            ['layoutEx', 'disk', 'chain', 'fileKey'],
             ['layoutEx', 'file'],
             ['layoutEx', 'snapshot'],
             ['layoutEx', 'snapshot', 'disk'],

diff --git a/src/VmWareClientInit.php b/src/VmWareClientInit.php
@@ -139,7 +139,12 @@ private function initSoapSession(): void
 
         if (! $sessionInfo) {
             $this->createSoapSession();
-        } elseif ($this->isSessionExpired($sessionInfo['expired_at'])) {
+        } elseif (
+            $this->isSessionExpired($sessionInfo['expired_at'])
+            || Carbon::parse($sessionInfo['expired_at'])->diffInSeconds(Carbon::now()) < 30
+        ) {
+            $this->createSoapClientWithExistingSession($sessionInfo['vmware_soap_session']);
+            $this->deleteSoapSession();
             $this->createSoapSession();
         } else {
             $this->createSoapClientWithExistingSession($sessionInfo['vmware_soap_session']);
@@ -222,7 +227,7 @@ private function deleteSoapSession()
             $soaplogout['_this'] = $sessionManager;
             $this->soapClient->Logout($soaplogout);
         } catch (\Exception $exception) {
-            Log::error('Can\'t delete soap session');
+            Log::error('Can\'t delete soap session: '.$exception->getMessage());
         }
     }
 }