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

Merge pull request #28 from wenjiegit/master

Browse source 
merge from wenjie.zhao for colorful log.
This commit is contained in:
winlin 2014-03-18 11:00:00 +08:00
commit 8029b7464a
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_config.cpp
View file

@ -308,7 +308,7 @@ int SrsConfDirective::read_token(SrsFileBuffer* buffer, std::vector<string>& arg
srs_error("line %d: unexpected end of file, expecting ; or \"}\"", buffer->line); srs_error("line %d: unexpected end of file, expecting ; or \"}\"", buffer->line);
return ERROR_SYSTEM_CONFIG_INVALID; return ERROR_SYSTEM_CONFIG_INVALID;
} }
srs_error("end of file. ret=%d", ret); srs_trace("end of file. ret=%d", ret);
return ret; return ret;
} }

24
trunk/src/app/srs_app_log.cpp
View file

@ -81,7 +81,7 @@ void SrsFastLog::verbose(const char* tag, int context_id, const char* fmt, ...)
size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap); size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
va_end(ap); va_end(ap);
write_log(log_data, size); write_log(log_data, size, SrsLogLevel::Verbose);
} }
void SrsFastLog::info(const char* tag, int context_id, const char* fmt, ...) void SrsFastLog::info(const char* tag, int context_id, const char* fmt, ...)
@ -101,7 +101,7 @@ void SrsFastLog::info(const char* tag, int context_id, const char* fmt, ...)
size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap); size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
va_end(ap); va_end(ap);
write_log(log_data, size); write_log(log_data, size, SrsLogLevel::Info);
} }
void SrsFastLog::trace(const char* tag, int context_id, const char* fmt, ...) void SrsFastLog::trace(const char* tag, int context_id, const char* fmt, ...)
@ -121,7 +121,7 @@ void SrsFastLog::trace(const char* tag, int context_id, const char* fmt, ...)
size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap); size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
va_end(ap); va_end(ap);
write_log(log_data, size); write_log(log_data, size, SrsLogLevel::Trace);
} }
void SrsFastLog::warn(const char* tag, int context_id, const char* fmt, ...) void SrsFastLog::warn(const char* tag, int context_id, const char* fmt, ...)
@ -141,7 +141,7 @@ void SrsFastLog::warn(const char* tag, int context_id, const char* fmt, ...)
size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap); size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
va_end(ap); va_end(ap);
write_log(log_data, size); write_log(log_data, size, SrsLogLevel::Warn);
} }
void SrsFastLog::error(const char* tag, int context_id, const char* fmt, ...) void SrsFastLog::error(const char* tag, int context_id, const char* fmt, ...)
@ -161,7 +161,10 @@ void SrsFastLog::error(const char* tag, int context_id, const char* fmt, ...)
size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap); size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
va_end(ap); va_end(ap);
write_log(log_data, size); // add strerror() to error msg.
size += snprintf(log_data + size, LOG_MAX_SIZE - size, "(%s)", strerror(errno));
write_log(log_data, size, SrsLogLevel::Error);
} }
bool SrsFastLog::generate_header(const char* tag, int context_id, const char* level_name, int* header_size) bool SrsFastLog::generate_header(const char* tag, int context_id, const char* level_name, int* header_size)
@ -203,7 +206,7 @@ bool SrsFastLog::generate_header(const char* tag, int context_id, const char* le
return true; return true;
} }
void SrsFastLog::write_log(char* str_log, int size) void SrsFastLog::write_log(char *str_log, int size, int _level)
{ {
// ensure the tail and EOF of string // ensure the tail and EOF of string
// LOG_TAIL_SIZE for the TAIL char. // LOG_TAIL_SIZE for the TAIL char.
@ -214,5 +217,12 @@ void SrsFastLog::write_log(char* str_log, int size)
log_data[size++] = LOG_TAIL; log_data[size++] = LOG_TAIL;
log_data[size++] = 0; log_data[size++] = 0;
printf("%s", str_log); // if is error msg, then print color msg.
// \033[1;31m : red text code in shell
// \033[1;31m : normal text code
if (_level == SrsLogLevel::Error) {
printf("\033[1;31m%s\033[0m", str_log);
} else {
printf("%s", str_log);
}
} }

2
trunk/src/app/srs_app_log.hpp
View file

@ -91,7 +91,7 @@ public:
virtual void error(const char* tag, int context_id, const char* fmt, ...); virtual void error(const char* tag, int context_id, const char* fmt, ...);
private: private:
virtual bool generate_header(const char* tag, int context_id, const char* level_name, int* header_size); virtual bool generate_header(const char* tag, int context_id, const char* level_name, int* header_size);
virtual void write_log(char* str_log, int size); virtual void write_log(char* str_log, int size, int _level);
}; };
#endif #endif