diff --git a/app/Services/Cloudflare/FirewallService.php b/app/Services/Cloudflare/FirewallService.php index c319d9f..98766f3 100644 --- a/app/Services/Cloudflare/FirewallService.php +++ b/app/Services/Cloudflare/FirewallService.php @@ -2,10 +2,10 @@ namespace App\Services\Cloudflare; -use App\Entities\Cloudflare\FirewallEntity; -use App\Entities\Cloudflare\ZoneEntity; -use App\Models\Cloudflare\AccountModel; use App\Models\Cloudflare\FirewallModel; +use App\Models\Cloudflare\AccountModel; +use App\Entities\Cloudflare\ZoneEntity; +use App\Entities\Cloudflare\FirewallEntity; class FirewallService extends CloudflareService { @@ -102,7 +102,7 @@ class FirewallService extends CloudflareService $body = json_decode($response->getBody()); foreach ($body->result->rules as $rule) { if (!is_object(value: $rule) || get_class($rule) !== 'stdClass') { - log_message("error", "Firewall: rule is not a stdClass:\n" . var_export($rule, true) . "\n"); + log_message("error", "Firewall: result is not a stdClass:\n" . var_export($rule, true) . "\n"); } else { $formDatas = ['rulesetid' => $body->result->id]; $formDatas = $this->getArrayByResult($rule, $formDatas); diff --git a/app/Services/Cloudflare/RecordService.php b/app/Services/Cloudflare/RecordService.php index 826e305..8dd1974 100644 --- a/app/Services/Cloudflare/RecordService.php +++ b/app/Services/Cloudflare/RecordService.php @@ -173,7 +173,8 @@ class RecordService extends CloudflareService $cnt = 1; foreach ($results as $result) { if (!is_object($result) || get_class($result) !== 'stdClass') { - throw new \Exception("Record: result is not a stdClass:\n" . var_export($result, true) . "\n"); + log_message("error", "Record: result is not a stdClass:\n" . var_export($result, true) . "\n"); + continue; } $formDatas = $this->getArrayByResult($result); $entity = $this->getModel()->modify(new RecordEntity(), $formDatas);