external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

move log level parse to app utility

Browse source
This commit is contained in:
winlin 2014-04-10 14:20:02 +08:00
parent f2f30dcc52
commit ccba9ba9ba
3 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_utility.cpp
View file

@ -22,3 +22,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
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;
}
}

6
trunk/src/app/srs_app_utility.hpp
View file

@ -30,4 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
/**
* 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 #endif

14
trunk/src/main/srs_main_server.cpp
View file

@ -164,19 +164,7 @@ int main(int argc, char** argv)
} }
// config parsed, initialize log. // config parsed, initialize log.
if ("verbose" == _srs_config->get_srs_log_level()) { _srs_log->set_level(srs_get_log_level(_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_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION);
srs_trace("uname: "SRS_UNAME); srs_trace("uname: "SRS_UNAME);