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

feat(api): add 'show_timestamps' parameter to logs endpoints

Browse source
This commit is contained in:
Yanluis Fermin 2025-07-30 21:32:11 -04:00
parent c239b8bbba
commit 0eb2ea86e8
No known key found for this signature in database
GPG key ID: FD070B24B6AD2128
4 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Api/ApplicationsController.php
View file

@ -1553,6 +1553,13 @@ public function application_by_uuid(Request $request)
default: 100, default: 100,
) )
), ),
new OA\Parameter(
name: 'show_timestamps',
in: 'query',
description: 'Show timestamps in the logs.',
required: false,
schema: new OA\Schema(type: 'boolean', default: false),
),
], ],
responses: [ responses: [
new OA\Response( new OA\Response(
@ -1616,8 +1623,9 @@ public function logs_by_uuid(Request $request)
], 400); ], 400);
} }
$lines = $request->query->get('lines', 100) ?: 100; $lines = $request->query->get('lines', 100);
$logs = getContainerLogs($application->destination->server, $container['ID'], $lines); $showTimestamps = $request->query->get('show_timestamps', false);
$logs = getContainerLogs($application->destination->server, $container['ID'], $lines, $showTimestamps);
return response()->json([ return response()->json([
'logs' => $logs, 'logs' => $logs,

12
app/Http/Controllers/Api/DatabasesController.php
View file

@ -1566,6 +1566,13 @@ public function create_database(Request $request, NewDatabaseTypes $type)
default: 100, default: 100,
) )
), ),
new OA\Parameter(
name: 'show_timestamps',
in: 'query',
description: 'Show timestamps in the logs.',
required: false,
schema: new OA\Schema(type: 'boolean', default: false),
),
], ],
responses: [ responses: [
new OA\Response( new OA\Response(
@ -1629,8 +1636,9 @@ public function logs_by_uuid(Request $request)
], 400); ], 400);
} }
$lines = $request->query->get('lines', 100) ?: 100; $lines = $request->query->get('lines', 100);
$logs = getContainerLogs($database->destination->server, $container['ID'], $lines); $showTimestamps = $request->query->get('show_timestamps', false);
$logs = getContainerLogs($database->destination->server, $container['ID'], $lines, $showTimestamps);
return response()->json([ return response()->json([
'logs' => $logs, 'logs' => $logs,

12
app/Http/Controllers/Api/ServicesController.php
View file

@ -486,6 +486,13 @@ public function service_by_uuid(Request $request)
default: 100, default: 100,
) )
), ),
new OA\Parameter(
name: 'show_timestamps',
in: 'query',
description: 'Show timestamps in the logs.',
required: false,
schema: new OA\Schema(type: 'boolean', default: false),
),
], ],
responses: [ responses: [
new OA\Response( new OA\Response(
@ -551,8 +558,9 @@ public function logs_by_uuid(Request $request)
], 400); ], 400);
} }
$lines = $request->query->get('lines', 100) ?: 100; $lines = $request->query->get('lines', 100);
$logs = getContainerLogs($service->destination->server, $container['ID'], $lines); $showTimestamps = $request->query->get('show_timestamps', false);
$logs = getContainerLogs($service->destination->server, $container['ID'], $lines, $showTimestamps);
return response()->json([ return response()->json([
'logs' => $logs, 'logs' => $logs,

16
bootstrap/helpers/docker.php
View file

@ -1115,18 +1115,18 @@ function validateComposeFile(string $compose, int $server_id): string|Throwable
} }
} }
function getContainerLogs(Server $server, string $container_id, int $lines = 100): string function getContainerLogs(Server $server, string $container_id, int $lines = 100, bool $showTimestamps = false): string
{ {
$command = "docker logs -n {$lines} {$container_id}";
if ($server->isSwarm()) { if ($server->isSwarm()) {
$output = instant_remote_process([ $command = "docker service logs -n {$lines} {$container_id}";
"docker service logs -n {$lines} {$container_id}",
], $server);
} else {
$output = instant_remote_process([
"docker logs -n {$lines} {$container_id}",
], $server);
} }
if ($showTimestamps) {
$command .= ' --timestamps';
}
$output = instant_remote_process([$command], $server);
$output .= removeAnsiColors($output); $output .= removeAnsiColors($output);
return $output; return $output;