diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index faba0f788..2c5e9f595 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -22,3 +22,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include + +#include +#include + +int srs_get_log_level(std::string level) +{ + if ("verbose" == _srs_config->get_srs_log_level()) { + return SrsLogLevel::Verbose; + } else if ("info" == _srs_config->get_srs_log_level()) { + return SrsLogLevel::Info; + } else if ("trace" == _srs_config->get_srs_log_level()) { + return SrsLogLevel::Trace; + } else if ("warn" == _srs_config->get_srs_log_level()) { + return SrsLogLevel::Warn; + } else if ("error" == _srs_config->get_srs_log_level()) { + return SrsLogLevel::Error; + } else { + return SrsLogLevel::Trace; + } +} diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp index 990a52673..155ddcec4 100644 --- a/trunk/src/app/srs_app_utility.hpp +++ b/trunk/src/app/srs_app_utility.hpp @@ -30,4 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +/** +* convert level in string to log level in int. +* @return the log level defined in SrsLogLevel. +*/ +extern int srs_get_log_level(std::string level); + #endif diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 6c0960541..05d8b18e3 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -164,19 +164,7 @@ int main(int argc, char** argv) } // config parsed, initialize log. - if ("verbose" == _srs_config->get_srs_log_level()) { - _srs_log->set_level(SrsLogLevel::Verbose); - } else if ("info" == _srs_config->get_srs_log_level()) { - _srs_log->set_level(SrsLogLevel::Info); - } else if ("trace" == _srs_config->get_srs_log_level()) { - _srs_log->set_level(SrsLogLevel::Trace); - } else if ("warn" == _srs_config->get_srs_log_level()) { - _srs_log->set_level(SrsLogLevel::Warn); - } else if ("error" == _srs_config->get_srs_log_level()) { - _srs_log->set_level(SrsLogLevel::Error); - } else { - _srs_log->set_level(SrsLogLevel::Trace); - } + _srs_log->set_level(srs_get_log_level(_srs_config->get_srs_log_level())); srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); srs_trace("uname: "SRS_UNAME);