winlin

fix #207, trim the last 0 of log. 1.0.18

@@ -383,6 +383,7 @@ Supported operating systems and hardware: @@ -383,6 +383,7 @@ Supported operating systems and hardware:
383 * 2013-10-17, Created.<br/> 383 * 2013-10-17, Created.<br/>
384 384
385 ## History 385 ## History
  386 +* v1.0, 2015-01-02, hotfix [#207](https://github.com/winlinvip/simple-rtmp-server/issues/207), trim the last 0 of log. 1.0.18
386 * v1.0, 2015-01-02, hotfix [#216](https://github.com/winlinvip/simple-rtmp-server/issues/216), http-callback post in application/json content-type. 1.0.17 387 * v1.0, 2015-01-02, hotfix [#216](https://github.com/winlinvip/simple-rtmp-server/issues/216), http-callback post in application/json content-type. 1.0.17
387 * v1.0, 2015-01-01, hotfix [#270](https://github.com/winlinvip/simple-rtmp-server/issues/270), memory leak for http client post. 1.0.16 388 * v1.0, 2015-01-01, hotfix [#270](https://github.com/winlinvip/simple-rtmp-server/issues/270), memory leak for http client post. 1.0.16
388 * v1.0, 2014-12-29, hotfix [#267](https://github.com/winlinvip/simple-rtmp-server/issues/267), the forward dest ep should use server. 1.0.15 389 * v1.0, 2014-12-29, hotfix [#267](https://github.com/winlinvip/simple-rtmp-server/issues/267), the forward dest ep should use server. 1.0.15
@@ -326,7 +326,6 @@ void SrsFastLog::write_log(int& fd, char *str_log, int size, int level) @@ -326,7 +326,6 @@ void SrsFastLog::write_log(int& fd, char *str_log, int size, int level)
326 326
327 // add some to the end of char. 327 // add some to the end of char.
328 str_log[size++] = LOG_TAIL; 328 str_log[size++] = LOG_TAIL;
329 - str_log[size++] = 0;  
330 329
331 // if not to file, to console and return. 330 // if not to file, to console and return.
332 if (!log_to_file_tank) { 331 if (!log_to_file_tank) {
@@ -336,11 +335,11 @@ void SrsFastLog::write_log(int& fd, char *str_log, int size, int level) @@ -336,11 +335,11 @@ void SrsFastLog::write_log(int& fd, char *str_log, int size, int level)
336 // \033[33m : yellow text code in shell 335 // \033[33m : yellow text code in shell
337 // \033[0m : normal text code 336 // \033[0m : normal text code
338 if (level <= SrsLogLevel::Trace) { 337 if (level <= SrsLogLevel::Trace) {
339 - printf("%s", str_log); 338 + printf("%.*s", size, str_log);
340 } else if (level == SrsLogLevel::Warn) { 339 } else if (level == SrsLogLevel::Warn) {
341 - printf("\033[33m%s\033[0m", str_log); 340 + printf("\033[33m%.*s\033[0m", size, str_log);
342 } else{ 341 } else{
343 - printf("\033[31m%s\033[0m", str_log); 342 + printf("\033[31m%.*s\033[0m", size, str_log);
344 } 343 }
345 344
346 return; 345 return;
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 1 32 #define VERSION_MAJOR 1
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 17 34 +#define VERSION_REVISION 18
35 // server info. 35 // server info.
36 #define RTMP_SIG_SRS_KEY "SRS" 36 #define RTMP_SIG_SRS_KEY "SRS"
37 #define RTMP_SIG_SRS_ROLE "origin/edge server" 37 #define RTMP_SIG_SRS_ROLE "origin/edge server"