mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-17 07:49:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1214 from acelaya-forks/feature/min-task-workers

Browse source 
Feature/min task workers
This commit is contained in:
Alejandro Celaya 2021-10-23 16:47:18 +02:00 • committed by GitHub
commit 9030e5e6eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
## [Unreleased] ## [2.9.2] - 2021-10-23
### Added ### Added
* *Nothing* * *Nothing*
@ -18,8 +18,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
* *Nothing* * *Nothing*
### Fixed ### Fixed
* [#1210](https://github.com/shlinkio/shlink/issues/1210) Fixed real time updates not being notified. * [#1210](https://github.com/shlinkio/shlink/issues/1210) Fixed real time updates not being notified due to an incorrect handling of db transactions on multi-process tasks.
* [#1211](https://github.com/shlinkio/shlink/issues/1211) Fixed `There is no active transaction` error when running migrations in MySQL/Mariadb after updating to doctrine-migrations 3.3. * [#1211](https://github.com/shlinkio/shlink/issues/1211) Fixed `There is no active transaction` error when running migrations in MySQL/Mariadb after updating to doctrine-migrations 3.3.
* [#1197](https://github.com/shlinkio/shlink/issues/1197) Fixed amount of task workers provided via config option or env var not being validated to ensure enough workers to process all parallel tasks.
## [2.9.1] - 2021-10-11 ## [2.9.1] - 2021-10-11

2
composer.json
View file

@ -51,7 +51,7 @@
"shlinkio/shlink-config": "^1.2", "shlinkio/shlink-config": "^1.2",
"shlinkio/shlink-event-dispatcher": "^2.1", "shlinkio/shlink-event-dispatcher": "^2.1",
"shlinkio/shlink-importer": "^2.3.1", "shlinkio/shlink-importer": "^2.3.1",
"shlinkio/shlink-installer": "^6.2", "shlinkio/shlink-installer": "^6.2.1",
"shlinkio/shlink-ip-geolocation": "^2.0", "shlinkio/shlink-ip-geolocation": "^2.0",
"symfony/console": "^5.3", "symfony/console": "^5.3",
"symfony/filesystem": "^5.3", "symfony/filesystem": "^5.3",

32
config/autoload/swoole.global.php
View file

@ -4,22 +4,28 @@ declare(strict_types=1);
use function Shlinkio\Shlink\Common\env; use function Shlinkio\Shlink\Common\env;
return [ use const Shlinkio\Shlink\MIN_TASK_WORKERS;
'mezzio-swoole' => [ return (static function () {
// Setting this to true can have unexpected behaviors when running several concurrent slow DB queries $taskWorkers = (int) env('TASK_WORKER_NUM', 16);
'enable_coroutine' => false,
'swoole-http-server' => [ return [
'host' => '0.0.0.0',
'port' => (int) env('PORT', 8080),
'process-name' => 'shlink',
'options' => [ 'mezzio-swoole' => [
'worker_num' => (int) env('WEB_WORKER_NUM', 16), // Setting this to true can have unexpected behaviors when running several concurrent slow DB queries
'task_worker_num' => (int) env('TASK_WORKER_NUM', 16), 'enable_coroutine' => false,
'swoole-http-server' => [
'host' => '0.0.0.0',
'port' => (int) env('PORT', 8080),
'process-name' => 'shlink',
'options' => [
'worker_num' => (int) env('WEB_WORKER_NUM', 16),
'task_worker_num' => $taskWorkers < MIN_TASK_WORKERS ? MIN_TASK_WORKERS : $taskWorkers,
],
], ],
], ],
],
]; ];
})();

1
config/constants.php
View file

@ -18,3 +18,4 @@ const DEFAULT_QR_CODE_SIZE = 300;
const DEFAULT_QR_CODE_MARGIN = 0; const DEFAULT_QR_CODE_MARGIN = 0;
const DEFAULT_QR_CODE_FORMAT = 'png'; const DEFAULT_QR_CODE_FORMAT = 'png';
const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l'; const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l';
const MIN_TASK_WORKERS = 4;