From 3b5243689b1375ac8109a950678b14e33ebc23d6 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 17 Dec 2023 19:26:28 +0100 Subject: [PATCH 1/2] Fine-tune RoadRunner logs to avoid too many useless info --- CHANGELOG.md | 3 ++- config/roadrunner/.rr.dev.yml | 4 +++- config/roadrunner/.rr.yml | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02c2396f2..006766a88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). -## [Unreleased] +## [3.7.1] - 2023-12-17 ### Added * *Nothing* @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Fixed * [#1947](https://github.com/shlinkio/shlink/issues/1947) Fix error when importing short URLs while using Postgres. +* [#1939](https://github.com/shlinkio/shlink/issues/1939) Fine-tune RoadRunner logs to avoid too many useless info. ## [3.7.0] - 2023-11-25 diff --git a/config/roadrunner/.rr.dev.yml b/config/roadrunner/.rr.dev.yml index a69a805fa..cdc1f326e 100644 --- a/config/roadrunner/.rr.dev.yml +++ b/config/roadrunner/.rr.dev.yml @@ -1,4 +1,4 @@ -version: '3.0' +version: '3' rpc: listen: tcp://127.0.0.1:6001 @@ -38,3 +38,5 @@ logs: level: debug metrics: level: debug + jobs: + level: debug diff --git a/config/roadrunner/.rr.yml b/config/roadrunner/.rr.yml index b6783c289..0c535b77a 100644 --- a/config/roadrunner/.rr.yml +++ b/config/roadrunner/.rr.yml @@ -1,4 +1,4 @@ -version: '3.0' +version: '3' rpc: listen: tcp://127.0.0.1:6001 @@ -33,4 +33,6 @@ logs: http: mode: 'off' # Disable logging as Shlink handles it internally server: - level: debug # Everything written to worker stderr is logged + level: info + jobs: + level: debug From 17c4f13568c37ea0c23837492673563b117a3962 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 17 Dec 2023 19:49:50 +0100 Subject: [PATCH 2/2] Set fixed versions for Shlink dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d9db11124..db0fa4c3a 100644 --- a/composer.json +++ b/composer.json @@ -45,12 +45,12 @@ "php-middleware/request-id": "^4.1", "pugx/shortid-php": "^1.1", "ramsey/uuid": "^4.7", - "shlinkio/shlink-common": "dev-main#4d0b6ca as 5.8", + "shlinkio/shlink-common": "^5.7.1", "shlinkio/shlink-config": "^2.5", "shlinkio/shlink-event-dispatcher": "^3.1", - "shlinkio/shlink-importer": "dev-main#4616c54 as 5.3", - "shlinkio/shlink-installer": "dev-develop#cb0eaea as 8.7", - "shlinkio/shlink-ip-geolocation": "dev-main#e8406aa as 3.4", + "shlinkio/shlink-importer": "^5.2.1", + "shlinkio/shlink-installer": "^8.6.1", + "shlinkio/shlink-ip-geolocation": "^3.4", "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.2", "spiral/roadrunner-cli": "^2.5",