mirror of
https://github.com/shlinkio/shlink.git
synced 2024-10-22 20:25:35 +03:00
Fix incorrect timeout in init commands
This commit is contained in:
parent
61686ed6ea
commit
cdf5082cff
5 changed files with 6 additions and 6 deletions
|
@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
|
||||||
* [#1790](https://github.com/shlinkio/shlink/issues/1790) Drop support for PHP 8.1.
|
* [#1790](https://github.com/shlinkio/shlink/issues/1790) Drop support for PHP 8.1.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* *Nothing*
|
* [#1819](https://github.com/shlinkio/shlink/issues/1819) Fix incorrect timeout when running DB commands during Shlink start-up.
|
||||||
|
|
||||||
|
|
||||||
## [3.6.3] - 2023-06-14
|
## [3.6.3] - 2023-06-14
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
"shlinkio/shlink-config": "dev-main#245bbdd as 2.5",
|
"shlinkio/shlink-config": "dev-main#245bbdd as 2.5",
|
||||||
"shlinkio/shlink-event-dispatcher": "dev-main#bd3a62b as 3.1",
|
"shlinkio/shlink-event-dispatcher": "dev-main#bd3a62b as 3.1",
|
||||||
"shlinkio/shlink-importer": "^5.1",
|
"shlinkio/shlink-importer": "^5.1",
|
||||||
"shlinkio/shlink-installer": "^8.4.1",
|
"shlinkio/shlink-installer": "^8.4.2",
|
||||||
"shlinkio/shlink-ip-geolocation": "^3.2",
|
"shlinkio/shlink-ip-geolocation": "^3.2",
|
||||||
"shlinkio/shlink-json": "^1.0",
|
"shlinkio/shlink-json": "^1.0",
|
||||||
"spiral/roadrunner": "^2023.1",
|
"spiral/roadrunner": "^2023.1",
|
||||||
|
|
|
@ -23,8 +23,8 @@ class ProcessRunner implements ProcessRunnerInterface
|
||||||
public function __construct(private ProcessHelper $helper, ?callable $createProcess = null)
|
public function __construct(private ProcessHelper $helper, ?callable $createProcess = null)
|
||||||
{
|
{
|
||||||
$this->createProcess = $createProcess !== null
|
$this->createProcess = $createProcess !== null
|
||||||
? Closure::fromCallable($createProcess)
|
? $createProcess(...)
|
||||||
: static fn (array $cmd) => new Process($cmd, null, null, null, LockedCommandConfig::DEFAULT_TTL);
|
: static fn (array $cmd) => new Process($cmd, timeout: LockedCommandConfig::DEFAULT_TTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function run(OutputInterface $output, array $cmd): void
|
public function run(OutputInterface $output, array $cmd): void
|
||||||
|
|
|
@ -12,7 +12,7 @@ enum DeviceType: string
|
||||||
|
|
||||||
public static function matchFromUserAgent(string $userAgent): ?self
|
public static function matchFromUserAgent(string $userAgent): ?self
|
||||||
{
|
{
|
||||||
$detect = new MobileDetect(null, $userAgent); // @phpstan-ignore-line
|
$detect = new MobileDetect(userAgent: $userAgent); // @phpstan-ignore-line
|
||||||
|
|
||||||
return match (true) {
|
return match (true) {
|
||||||
// $detect->is('iOS') && $detect->isTablet() => self::IOS, // TODO To detect iPad only
|
// $detect->is('iOS') && $detect->isTablet() => self::IOS, // TODO To detect iPad only
|
||||||
|
|
|
@ -40,7 +40,7 @@ class ListTagsAction extends AbstractRestAction
|
||||||
|
|
||||||
// This part is deprecated. To get tags with stats, the /tags/stats endpoint should be used instead
|
// This part is deprecated. To get tags with stats, the /tags/stats endpoint should be used instead
|
||||||
$tagsInfo = $this->tagService->tagsInfo($params, $apiKey);
|
$tagsInfo = $this->tagService->tagsInfo($params, $apiKey);
|
||||||
$rawTags = $this->serializePaginator($tagsInfo, null, 'stats');
|
$rawTags = $this->serializePaginator($tagsInfo, dataProp: 'stats');
|
||||||
$rawTags['data'] = map($tagsInfo, static fn (TagInfo $info) => $info->tag);
|
$rawTags['data'] = map($tagsInfo, static fn (TagInfo $info) => $info->tag);
|
||||||
|
|
||||||
return new JsonResponse(['tags' => $rawTags]);
|
return new JsonResponse(['tags' => $rawTags]);
|
||||||
|
|
Loading…
Reference in a new issue