正在显示
3 个修改的文件
包含
27 行增加
和
13 行删除
| @@ -22,3 +22,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -22,3 +22,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <srs_app_utility.hpp> | 24 | #include <srs_app_utility.hpp> |
| 25 | + | ||
| 26 | +#include <srs_kernel_log.hpp> | ||
| 27 | +#include <srs_app_config.hpp> | ||
| 28 | + | ||
| 29 | +int srs_get_log_level(std::string level) | ||
| 30 | +{ | ||
| 31 | + if ("verbose" == _srs_config->get_srs_log_level()) { | ||
| 32 | + return SrsLogLevel::Verbose; | ||
| 33 | + } else if ("info" == _srs_config->get_srs_log_level()) { | ||
| 34 | + return SrsLogLevel::Info; | ||
| 35 | + } else if ("trace" == _srs_config->get_srs_log_level()) { | ||
| 36 | + return SrsLogLevel::Trace; | ||
| 37 | + } else if ("warn" == _srs_config->get_srs_log_level()) { | ||
| 38 | + return SrsLogLevel::Warn; | ||
| 39 | + } else if ("error" == _srs_config->get_srs_log_level()) { | ||
| 40 | + return SrsLogLevel::Error; | ||
| 41 | + } else { | ||
| 42 | + return SrsLogLevel::Trace; | ||
| 43 | + } | ||
| 44 | +} |
| @@ -30,4 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -30,4 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| 32 | 32 | ||
| 33 | +/** | ||
| 34 | +* convert level in string to log level in int. | ||
| 35 | +* @return the log level defined in SrsLogLevel. | ||
| 36 | +*/ | ||
| 37 | +extern int srs_get_log_level(std::string level); | ||
| 38 | + | ||
| 33 | #endif | 39 | #endif |
| @@ -164,19 +164,7 @@ int main(int argc, char** argv) | @@ -164,19 +164,7 @@ int main(int argc, char** argv) | ||
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | // config parsed, initialize log. | 166 | // config parsed, initialize log. |
| 167 | - if ("verbose" == _srs_config->get_srs_log_level()) { | ||
| 168 | - _srs_log->set_level(SrsLogLevel::Verbose); | ||
| 169 | - } else if ("info" == _srs_config->get_srs_log_level()) { | ||
| 170 | - _srs_log->set_level(SrsLogLevel::Info); | ||
| 171 | - } else if ("trace" == _srs_config->get_srs_log_level()) { | ||
| 172 | - _srs_log->set_level(SrsLogLevel::Trace); | ||
| 173 | - } else if ("warn" == _srs_config->get_srs_log_level()) { | ||
| 174 | - _srs_log->set_level(SrsLogLevel::Warn); | ||
| 175 | - } else if ("error" == _srs_config->get_srs_log_level()) { | ||
| 176 | - _srs_log->set_level(SrsLogLevel::Error); | ||
| 177 | - } else { | ||
| 178 | - _srs_log->set_level(SrsLogLevel::Trace); | ||
| 179 | - } | 167 | + _srs_log->set_level(srs_get_log_level(_srs_config->get_srs_log_level())); |
| 180 | 168 | ||
| 181 | srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); | 169 | srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); |
| 182 | srs_trace("uname: "SRS_UNAME); | 170 | srs_trace("uname: "SRS_UNAME); |
-
请 注册 或 登录 后发表评论