mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 08:04:19 +02:00
remove unnecessary validation and fix safe to DB
This commit is contained in:
parent
99f2d4d711
commit
44f319460f
@ -243,6 +243,7 @@ public function updatedServerTimezone($value)
|
||||
return;
|
||||
}
|
||||
$this->server->settings->server_timezone = $value;
|
||||
$this->updateServerTimezone($value);
|
||||
}
|
||||
|
||||
private function updateServerTimezone($value)
|
||||
@ -260,42 +261,13 @@ private function updateServerTimezone($value)
|
||||
"date +%Z",
|
||||
"cat /etc/timezone 2>/dev/null || echo 'Unable to read /etc/timezone'",
|
||||
];
|
||||
|
||||
$result = instant_remote_process($commands, $this->server);
|
||||
|
||||
if (!isset($result['output']) || empty($result['output'])) {
|
||||
throw new \Exception("No output received from server. The timezone may not have been updated.");
|
||||
}
|
||||
|
||||
$output = is_array($result['output']) ? $result['output'] : explode("\n", trim($result['output']));
|
||||
$output = array_filter($output); // Remove empty lines
|
||||
|
||||
if (count($output) < 2) {
|
||||
throw new \Exception("Unexpected output format: " . implode("\n", $output));
|
||||
}
|
||||
|
||||
$oldTimezone = $output[0];
|
||||
$newTimezone = end($output);
|
||||
|
||||
$errors = array_filter($output, function($line) {
|
||||
return strpos($line, 'failed') !== false;
|
||||
});
|
||||
|
||||
if (!empty($errors)) {
|
||||
throw new \Exception("Timezone change failed. Errors: " . implode(", ", $errors));
|
||||
}
|
||||
|
||||
if ($oldTimezone === $newTimezone) {
|
||||
throw new \Exception("Timezone change failed. The timezone is still set to {$oldTimezone}.");
|
||||
}
|
||||
|
||||
$dateTime = new \DateTime('now', new \DateTimeZone($value));
|
||||
$phpTimezone = $dateTime->getTimezone()->getName();
|
||||
|
||||
$this->server->settings->server_timezone = $phpTimezone;
|
||||
|
||||
instant_remote_process($commands, $this->server);
|
||||
|
||||
$this->server->settings->server_timezone = $value;
|
||||
$this->server->settings->save();
|
||||
|
||||
$this->dispatch('success', "Timezone successfully changed from {$oldTimezone} to {$newTimezone} (PHP: {$phpTimezone}).");
|
||||
|
||||
$this->dispatch('success', "Timezone successfully changed to {$value}.");
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
$this->dispatch('error', $e->getMessage());
|
||||
|
Loading…
Reference in New Issue
Block a user