rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: JSON_UNESCAPED_UNICODE

Browse source
This commit is contained in:
Andras Bacsai 2024-05-23 11:58:54 +02:00
parent d9d0837024
commit df9ec711c5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Actions/CoolifyTask/RunRemoteProcess.php
View file

@ -60,7 +60,7 @@ public static function decodeOutput(?Activity $activity = null): string
$decoded = json_decode( $decoded = json_decode(
data_get($activity, 'description'), data_get($activity, 'description'),
associative: true, associative: true,
flags: JSON_THROW_ON_ERROR flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE
); );
} catch (\JsonException $exception) { } catch (\JsonException $exception) {
return ''; return '';
@ -164,7 +164,7 @@ protected function elapsedTime(): int
public function encodeOutput($type, $output) public function encodeOutput($type, $output)
{ {
$outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR); $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
$outputStack[] = [ $outputStack[] = [
'type' => $type, 'type' => $type,
@ -174,12 +174,12 @@ public function encodeOutput($type, $output)
'order' => $this->getLatestCounter(), 'order' => $this->getLatestCounter(),
]; ];
return json_encode($outputStack, flags: JSON_THROW_ON_ERROR); return json_encode($outputStack, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
} }
protected function getLatestCounter(): int protected function getLatestCounter(): int
{ {
$description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR); $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
if ($description === null || count($description) === 0) { if ($description === null || count($description) === 0) {
return 1; return 1;
} }

1
app/Jobs/ServerStatusJob.php
View file

@ -57,7 +57,6 @@ public function handle()
} }
private function check_docker_engine() private function check_docker_engine()
{ {
ray('Checking Docker Engine');
$version = instant_remote_process([ $version = instant_remote_process([
"docker info", "docker info",
], $this->server, false); ], $this->server, false);