From 76290a5a12dad69b94231c98475cbf8dd6002aed Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 23 Mar 2014 14:47:09 +0800 Subject: [PATCH] fix bug of get daemon --- trunk/conf/console.conf | 8 ++++++++ trunk/src/app/srs_app_config.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 trunk/conf/console.conf diff --git a/trunk/conf/console.conf b/trunk/conf/console.conf new file mode 100644 index 000000000..032494cc6 --- /dev/null +++ b/trunk/conf/console.conf @@ -0,0 +1,8 @@ +# main config for srs. +# @see full.conf for detail config. + +listen 1935; +daemon off; +srs_log_tank console; +vhost __defaultVhost__ { +} diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index f69d072f9..786610ebf 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1304,7 +1304,7 @@ bool SrsConfig::get_deamon() { srs_assert(root); - SrsConfDirective* conf = root->get("deamon"); + SrsConfDirective* conf = root->get("daemon"); if (conf && conf->arg0() == "off") { return false; }