From 55d8cb4b7b3dabcb70106a842870eb08f4697b64 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 8 Oct 2021 21:58:33 +0800
Subject: [PATCH] Default to log to console for docker. v4.0.168

---
 trunk/Dockerfile                     |  2 +-
 trunk/conf/docker.conf               | 19 ++++---------------
 trunk/conf/srs.conf                  |  4 ++--
 trunk/doc/CHANGELOG.md               |  1 +
 trunk/src/app/srs_app_config.cpp     |  6 ++++++
 trunk/src/core/srs_core_version4.hpp |  2 +-
 trunk/src/main/srs_main_server.cpp   | 11 ++++++-----
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index fcccb08c0..bd37ef08c 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -32,4 +32,4 @@ COPY --from=build /usr/local/srs /usr/local/srs
 
 # Default workdir and command.
 WORKDIR /usr/local/srs
-CMD ["./objs/srs", "-c", "conf/srs.conf"]
+CMD ["./objs/srs", "-c", "conf/docker.conf"]
diff --git a/trunk/conf/docker.conf b/trunk/conf/docker.conf
index a819e3379..c8e4ede8d 100644
--- a/trunk/conf/docker.conf
+++ b/trunk/conf/docker.conf
@@ -1,4 +1,4 @@
-# main config for srs.
+# docker config for srs.
 # @see full.conf for detail config.
 
 listen              1935;
@@ -14,20 +14,10 @@ http_server {
     listen          8080;
     dir             ./objs/nginx/html;
 }
-stats {
-    network         0;
-    disk            sda sdb xvda xvdb;
-}
 rtc_server {
-    enabled         on;
-    # Listen at udp://8000
-    listen          8000;
-    #
-    # The $CANDIDATE means fetch from env, if not configed, use * as default.
-    #
-    # The * means retrieving server IP automatically, from all network interfaces,
-    # @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124
-    candidate       $CANDIDATE;
+    enabled on;
+    listen 8000;
+    candidate $CANDIDATE;
 }
 vhost __defaultVhost__ {
     hls {
@@ -39,6 +29,5 @@ vhost __defaultVhost__ {
     }
     rtc {
         enabled     on;
-        bframe      discard;
     }
 }
diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index a34525add..7f79f1150 100644
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -3,8 +3,8 @@
 
 listen              1935;
 max_connections     1000;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.log;
+#srs_log_tank        file;
+#srs_log_file        ./objs/srs.log;
 daemon              on;
 http_api {
     enabled         on;
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
index 227e2c4f6..90cbf02cd 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, 2021-10-08, Default to log to console for docker. v4.0.168
 * v4.0, 2021-10-07, Fix bugs #2648, #2415. v4.0.167
 * v4.0, 2021-10-03, Support --arch and --cross-prefix for cross compile. 4.0.166
 * v4.0, 2021-10-03, Actions: Create source tar file srs-server-4.0.165.tar.gz
diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index d664536b1..9d4fdbabf 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -6629,9 +6629,15 @@ string SrsConfig::get_ingest_input_url(SrsConfDirective* conf)
     return conf->arg0();
 }
 
+extern bool _srs_in_docker;
+
 bool SrsConfig::get_log_tank_file()
 {
     static bool DEFAULT = true;
+
+    if (_srs_in_docker) {
+        DEFAULT = false;
+    }
     
     SrsConfDirective* conf = root->get("srs_log_tank");
     if (!conf || conf->arg0().empty()) {
diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
index 83cfad3d6..35028dd26 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    167
+#define VERSION_REVISION    168
 
 #endif
diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
index 14fd9081a..643ad83d4 100644
--- a/trunk/src/main/srs_main_server.cpp
+++ b/trunk/src/main/srs_main_server.cpp
@@ -49,6 +49,7 @@ using namespace std;
 
 // pre-declare
 srs_error_t run_directly_or_daemon();
+srs_error_t srs_detect_docker();
 srs_error_t run_hybrid_server();
 void show_macro_features();
 
@@ -95,6 +96,11 @@ srs_error_t do_main(int argc, char** argv)
 #ifdef SRS_GPERF_MP
 #warning "gmp is not used for memory leak, please use gmc instead."
 #endif
+
+    // Ignore any error while detecting docker.
+    if ((err = srs_detect_docker()) != srs_success) {
+        srs_error_reset(err);
+    }
     
     // never use srs log(srs_trace, srs_error, etc) before config parse the option,
     // which will load the log config and apply it.
@@ -379,11 +385,6 @@ srs_error_t run_directly_or_daemon()
 {
     srs_error_t err = srs_success;
 
-    // Ignore any error while detecting docker.
-    if ((err = srs_detect_docker()) != srs_success) {
-        srs_error_reset(err);
-    }
-
     // Load daemon from config, disable it for docker.
     // @see https://github.com/ossrs/srs/issues/1594
     bool run_as_daemon = _srs_config->get_daemon();