From ba0b62fd376c9ebe309116b0beea9f73eefe173d Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 30 Jan 2022 21:08:43 +0800 Subject: [PATCH] For docker, always use the console for logging. v4.0.235 --- trunk/conf/docker.conf | 2 ++ trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/trunk/conf/docker.conf b/trunk/conf/docker.conf index dc7a2368b..f4ae9cd35 100644 --- a/trunk/conf/docker.conf +++ b/trunk/conf/docker.conf @@ -3,6 +3,8 @@ listen 1935; max_connections 1000; +# For docker, please use docker logs to manage the logs of SRS. +# See https://docs.docker.com/config/containers/logging/ srs_log_tank console; daemon off; http_api { diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 9d71ea673..2e3987154 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2022-01-30, For docker, always use the console for logging. v4.0.235 * v4.0, 2022-01-29, Merge [#2896](https://github.com/ossrs/srs/pull/2896): SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 * v4.0, 2022-01-23, Merge [#2886](https://github.com/ossrs/srs/pull/2886): Fix bug when free addrinfo. (#2886). v4.0.233 * v4.0, 2022-01-22, Merge [#2887](https://github.com/ossrs/srs/pull/2887): Fix memory leak in SrsMetaCache. (#2887). v4.0.232 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 699be66f0..492dbb742 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 234 +#define VERSION_REVISION 235 #endif