Skip to content
This repository has been archived by the owner on May 20, 2024. It is now read-only.

Supports environments that switched to docker runtime #42

Merged
merged 2 commits into from
Dec 24, 2020
Merged

Supports environments that switched to docker runtime #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa9ef2
Supports environments that switched to docker runtime
nunomaduro Dec 24, 2020
06b7a1a
Update LogsRepository.php
taylorotwell Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/Repositories/LogsRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,18 @@ protected function logGroupName($group)
{
$vaporUi = config('vapor-ui');

$environment = $vaporUi['environment'];

$usingDockerRuntime = Str::endsWith(
$_ENV['AWS_LAMBDA_FUNCTION_NAME'] ?? '',
"$environment-d"
);

return sprintf(
'/aws/lambda/vapor-%s-%s%s',
'/aws/lambda/vapor-%s-%s%s%s',
$vaporUi['project'],
$vaporUi['environment'],
$environment,
$usingDockerRuntime ? '-d' : '',
in_array($group, ['cli', 'queue']) ? "-$group" : ''
);
}
Expand Down Expand Up @@ -179,6 +187,7 @@ protected function filterPattern($filters)
}

$query = $filters['query'] ?? '';

$exclude = $this->ignore
? '- "'.collect($this->ignore)->implode('" - "').'"'
: '';
Expand Down