idcjp/cfmgrv4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfmgrv4 init...3

Browse Source
This commit is contained in:
최준흠 2024-10-22 16:16:19 +09:00
parent 9399749cf3
commit 6dc4dffd37
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controllers/CLI/Cloudflare.php
View File

@ -61,20 +61,22 @@ class Cloudflare extends BaseController
// $this->_db->transStart(); // $this->_db->transStart();
try { try {
$auths = $this->auth_process($uid); $auths = $this->auth_process($uid);
$accounts = [];
foreach ($auths as $auth) { foreach ($auths as $auth) {
$accounts += $this->account_process($auth); $accounts = $this->account_process($auth);
} foreach (array_values($accounts) as $account) {
$zones = []; $zones = $this->zone_process($account);
foreach ($accounts as $key => $account) { foreach (array_values($zones) as $zone) {
$zones += $this->zone_process($account); $records = $this->record_process($zone);
$firewalls = $this->firewall_process($zone);
}
}
} }
foreach ($zones as $key => $zone) { foreach ($zones as $key => $zone) {
$this->record_process($zone); $this->record_process($zone);
} }
foreach ($zones as $key => $zone) { // foreach ($zones as $key => $zone) {
$this->firewall_process($zone); // $this->firewall_process($zone);
} // }
log_message("notice", "Reload 작업을 완료하였습니다."); log_message("notice", "Reload 작업을 완료하였습니다.");
// $this->_db->transCommit(); // $this->_db->transCommit();
} catch (\Exception $e) { } catch (\Exception $e) {

2
app/Services/Cloudflare/Account.php
View File

@ -71,7 +71,7 @@ class Account extends Cloudflare
} }
$formDatas = $this->getArrayByResult($result); $formDatas = $this->getArrayByResult($result);
$entity = $this->getModel()->modify(new AccountEntity(), $formDatas); $entity = $this->getModel()->modify(new AccountEntity(), $formDatas);
log_message("debug", "[{$this->getMySocket()::$_request}] :{$cnt}/{$total} => {$entity->getTitle()} Account 처리"); log_message("debug", "{$cnt}/{$total} => {$entity->getTitle()} Account 처리,[{$this->getMySocket()::$_request}]");
$entitys[$entity->getPK()] = $entity; $entitys[$entity->getPK()] = $entity;
$cnt++; $cnt++;
} }

8
app/Services/Cloudflare/Firewall.php
View File

@ -94,9 +94,11 @@ class Firewall extends Cloudflare
if (!is_object(value: $rule) || get_class($rule) !== 'stdClass') { 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: rule is not a stdClass:\n" . var_export($rule, true) . "\n");
} else { } else {
$formDatas = ['rulesetid' => $body->result->id]; $formDatas = ['rulesetid' => $body->result->id];
$formDatas = $this->getArrayByResult($rule, $formDatas); $formDatas = $this->getArrayByResult($rule, $formDatas);
$entitys[$formDatas[FirewallModel::PK]] = $this->getModel()->modify(new FirewallEntity(), $formDatas); $entity = $this->getModel()->modify(new FirewallEntity(), $formDatas);
log_message("debug", "{$entity->getTitle()} Firewall 처리,[{$this->getMySocket()::$_request}]");
$entitys[$entity->getPK()] = $entity;
} }
} }
} catch (\Exception $e) { } catch (\Exception $e) {

2
app/Services/Cloudflare/Record.php
View File

@ -153,7 +153,7 @@ class Record extends Cloudflare
} }
$formDatas = $this->getArrayByResult($result); $formDatas = $this->getArrayByResult($result);
$entity = $this->getModel()->modify(new RecordEntity(), $formDatas); $entity = $this->getModel()->modify(new RecordEntity(), $formDatas);
log_message("debug", "[{$this->getMySocket()::$_request}] :{$cnt}/{$total} => {$entity->getTitle()} Record 처리"); log_message("debug", "{$cnt}/{$total} => {$entity->getTitle()} Record 처리,[{$this->getMySocket()::$_request}]");
$entitys[$entity->getPK()] = $entity; $entitys[$entity->getPK()] = $entity;
$cnt++; $cnt++;
} }

2
app/Services/Cloudflare/Zone.php
View File

@ -160,7 +160,7 @@ class Zone extends Cloudflare
$formDatas = $this->getArrayByResult($result); $formDatas = $this->getArrayByResult($result);
$formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas); $formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas);
$entity = $this->getModel()->modify(new ZoneEntity(), $formDatas); $entity = $this->getModel()->modify(new ZoneEntity(), $formDatas);
log_message("debug", "[{$this->getMySocket()::$_request}] :{$cnt}/{$total} => {$entity->getTitle()} Zone 처리"); log_message("debug", "{$cnt}/{$total} => {$entity->getTitle()} Zone 처리,[{$this->getMySocket()::$_request}]");
$entitys[$entity->getPK()] = $entity; $entitys[$entity->getPK()] = $entity;
$cnt++; $cnt++;
} }