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

refactor(api): update service logs endpoint to use sub service name

Browse source
This commit is contained in:
Yanluis Fermin 2025-07-30 11:29:27 -04:00
parent bc9bfaefc7
commit 28e20473da
No known key found for this signature in database
GPG key ID: FD070B24B6AD2128
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -451,7 +451,7 @@ public function service_by_uuid(Request $request)
#[OA\Get( #[OA\Get(
summary: 'Get service logs.', summary: 'Get service logs.',
description: 'Get service logs by UUID.', description: 'Get service logs by UUID.',
path: '/services/{uuid}/containers/{container_id}/logs', path: '/services/{uuid}/logs',
operationId: 'get-service-logs-by-uuid', operationId: 'get-service-logs-by-uuid',
security: [ security: [
['bearerAuth' => []], ['bearerAuth' => []],
@ -469,9 +469,9 @@ public function service_by_uuid(Request $request)
) )
), ),
new OA\Parameter( new OA\Parameter(
name: 'container_id', name: 'sub_service_name',
in: 'path', in: 'query',
description: 'Container ID.', description: 'Sub service name.',
required: true, required: true,
schema: new OA\Schema(type: 'string'), schema: new OA\Schema(type: 'string'),
), ),
@ -527,12 +527,16 @@ public function logs_by_uuid(Request $request)
if (! $uuid) { if (! $uuid) {
return response()->json(['message' => 'UUID is required.'], 400); return response()->json(['message' => 'UUID is required.'], 400);
} }
$subServiceName = $request->query->get('sub_service_name');
if (! $subServiceName) {
return response()->json(['message' => 'Sub service name is required.'], 400);
}
$service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first(); $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();
if (! $service) { if (! $service) {
return response()->json(['message' => 'Service not found.'], 404); return response()->json(['message' => 'Service not found.'], 404);
} }
$containers = getCurrentServiceContainerStatus($service->destination->server, $service->id); $containers = getCurrentServiceSubContainerStatus($service->destination->server, $service->id, $subServiceName);
if ($containers->count() == 0) { if ($containers->count() == 0) {
return response()->json([ return response()->json([
@ -540,9 +544,7 @@ public function logs_by_uuid(Request $request)
], 400); ], 400);
} }
$container = $containers->first(function ($container) use ($request) { $container = $containers->first();
return $container['ID'] === $request->container_id;
});
if (! $container) { if (! $container) {
return response()->json(['message' => 'Container not found.'], 404); return response()->json(['message' => 'Container not found.'], 404);

13
bootstrap/helpers/docker.php
View file

@ -66,6 +66,19 @@ function getCurrentDatabaseContainerStatus(Server $server, int $id): Collection
return $containers; return $containers;
} }
function getCurrentServiceSubContainerStatus(Server $server, int $id, string $subName): Collection
{
$containers = collect([]);
if (! $server->isSwarm()) {
$containers = instant_remote_process(["docker ps -a --filter='label=coolify.serviceId={$id}' --filter='label=coolify.service.subName={$subName}' --format '{{json .}}' "], $server);
$containers = format_docker_command_output_to_json($containers);
return $containers->filter();
}
return $containers;
}
function format_docker_command_output_to_json($rawOutput): Collection function format_docker_command_output_to_json($rawOutput): Collection
{ {
$outputLines = explode(PHP_EOL, $rawOutput); $outputLines = explode(PHP_EOL, $rawOutput);

2
routes/api.php
View file

@ -130,7 +130,7 @@
Route::patch('/services/{uuid}/envs/bulk', [ServicesController::class, 'create_bulk_envs'])->middleware(['api.ability:write']); Route::patch('/services/{uuid}/envs/bulk', [ServicesController::class, 'create_bulk_envs'])->middleware(['api.ability:write']);
Route::patch('/services/{uuid}/envs', [ServicesController::class, 'update_env_by_uuid'])->middleware(['api.ability:write']); Route::patch('/services/{uuid}/envs', [ServicesController::class, 'update_env_by_uuid'])->middleware(['api.ability:write']);
Route::delete('/services/{uuid}/envs/{env_uuid}', [ServicesController::class, 'delete_env_by_uuid'])->middleware(['api.ability:write']); Route::delete('/services/{uuid}/envs/{env_uuid}', [ServicesController::class, 'delete_env_by_uuid'])->middleware(['api.ability:write']);
Route::get('/services/{uuid}/containers/{container_id}/logs', [ServicesController::class, 'logs_by_uuid'])->middleware(['api.ability:read']); Route::get('/services/{uuid}/logs', [ServicesController::class, 'logs_by_uuid'])->middleware(['api.ability:read']);
Route::match(['get', 'post'], '/services/{uuid}/start', [ServicesController::class, 'action_deploy'])->middleware(['api.ability:write']); Route::match(['get', 'post'], '/services/{uuid}/start', [ServicesController::class, 'action_deploy'])->middleware(['api.ability:write']);
Route::match(['get', 'post'], '/services/{uuid}/restart', [ServicesController::class, 'action_restart'])->middleware(['api.ability:write']); Route::match(['get', 'post'], '/services/{uuid}/restart', [ServicesController::class, 'action_restart'])->middleware(['api.ability:write']);