mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 08:04:19 +02:00
fix: log drain only for Applications
This commit is contained in:
parent
a2ab23529f
commit
dfd5cc9cef
@ -2819,8 +2819,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
|
|||||||
$defaultLabels = defaultLabels($resource->id, $containerName, $pull_request_id, type: 'application');
|
$defaultLabels = defaultLabels($resource->id, $containerName, $pull_request_id, type: 'application');
|
||||||
$serviceLabels = $serviceLabels->merge($defaultLabels);
|
$serviceLabels = $serviceLabels->merge($defaultLabels);
|
||||||
|
|
||||||
if ($server->isLogDrainEnabled() && $resource->isLogDrainEnabled()) {
|
if ($server->isLogDrainEnabled()) {
|
||||||
data_set($service, 'logging', generate_fluentd_configuration());
|
if ($resource instanceof Application && $resource->isLogDrainEnabled()) {
|
||||||
|
data_set($service, 'logging', generate_fluentd_configuration());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if ($serviceLabels->count() > 0) {
|
if ($serviceLabels->count() > 0) {
|
||||||
if ($resource->settings->is_container_label_escape_enabled) {
|
if ($resource->settings->is_container_label_escape_enabled) {
|
||||||
@ -2923,8 +2925,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
|
|||||||
$restart = data_get_str($service, 'restart', RESTART_MODE);
|
$restart = data_get_str($service, 'restart', RESTART_MODE);
|
||||||
$logging = data_get($service, 'logging');
|
$logging = data_get($service, 'logging');
|
||||||
|
|
||||||
if ($server->isLogDrainEnabled() && $resource->isLogDrainEnabled()) {
|
if ($server->isLogDrainEnabled()) {
|
||||||
$logging = generate_fluentd_configuration();
|
if ($resource instanceof Application && $resource->isLogDrainEnabled()) {
|
||||||
|
$logging = generate_fluentd_configuration();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$volumes = collect(data_get($service, 'volumes', []));
|
$volumes = collect(data_get($service, 'volumes', []));
|
||||||
$networks = collect(data_get($service, 'networks', []));
|
$networks = collect(data_get($service, 'networks', []));
|
||||||
|
Loading…
Reference in New Issue
Block a user