Merge pull request #1287 from acelaya-forks/bugfix/db-error

Bugfix/db error

.github/workflows/publish-release.yml

@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-version: [ '8.0' ]
+        php-version: [ '8.0', '8.1' ]
         swoole: [ 'yes', 'no' ]
     steps:
       - uses: geekyeggo/delete-artifact@v1

CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+## [2.10.1] - 2021-12-21
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1285](https://github.com/shlinkio/shlink/issues/1285) Fixed error caused by database connections expiring after some hours of inactivity.
+* [#1286](https://github.com/shlinkio/shlink/issues/1286) Fixed `x-request-id` header not being generated during non-rest requests.
+
+
 ## [2.10.0] - 2021-12-12
 ### Added
 * [#1163](https://github.com/shlinkio/shlink/issues/1163) Allowed setting not-found redirects for default domain in the same way it's done for any other domain.

composer.json

@@ -48,7 +48,7 @@
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^1.0",
         "ramsey/uuid": "^4.2",
-        "shlinkio/shlink-common": "^4.2",
+        "shlinkio/shlink-common": "^4.2.1",
         "shlinkio/shlink-config": "^1.4",
         "shlinkio/shlink-event-dispatcher": "^2.3",
         "shlinkio/shlink-importer": "^2.5",

config/autoload/middleware-pipeline.global.php

@@ -17,6 +17,7 @@ return [
         'error-handler' => [
             'middleware' => [
                 ContentLengthMiddleware::class,
+                RequestIdMiddleware::class,
                 ErrorHandler::class,
                 Rest\Middleware\CrossDomainMiddleware::class,
             ],
@@ -24,7 +25,6 @@ return [
         'error-handler-rest' => [
             'path' => '/rest',
             'middleware' => [
-                RequestIdMiddleware::class,
                 ProblemDetails\ProblemDetailsMiddleware::class,
             ],
         ],

config/autoload/swoole.global.php

@@ -22,7 +22,7 @@ return (static function () {
 
                 'options' => [
                     'worker_num' => (int) env('WEB_WORKER_NUM', 16),
-                    'task_worker_num' => $taskWorkers < MIN_TASK_WORKERS ? MIN_TASK_WORKERS : $taskWorkers,
+                    'task_worker_num' => max($taskWorkers, MIN_TASK_WORKERS),
                 ],
             ],
         ],

module/Core/src/EventDispatcher/CloseDbConnectionEventListener.php

@@ -24,7 +24,7 @@ class CloseDbConnectionEventListener
             ($this->wrapped)($event);
         } finally {
             $this->em->getConnection()->close();
-            $this->em->clear();
+            $this->em->close();
         }
     }
 }

module/Core/test/EventDispatcher/CloseDbConnectionEventListenerTest.php

@@ -35,7 +35,7 @@ class CloseDbConnectionEventListenerTest extends TestCase
         $close = $conn->close()->will(function (): void {
         });
         $getConn = $this->em->getConnection()->willReturn($conn->reveal());
-        $clear = $this->em->clear()->will(function (): void {
+        $close = $this->em->close()->will(function (): void {
         });
         $open = $this->em->open()->will(function (): void {
         });
@@ -51,7 +51,7 @@ class CloseDbConnectionEventListenerTest extends TestCase
         self::assertTrue($wrappedWasCalled);
         $close->shouldHaveBeenCalledOnce();
         $getConn->shouldHaveBeenCalledOnce();
-        $clear->shouldHaveBeenCalledOnce();
+        $close->shouldHaveBeenCalledOnce();
         $open->shouldHaveBeenCalledOnce();
     }