merge from 2.0release

winlin
Commit 36eb0981ecd4229fca6aebb1b25f1a08d76cd0a6 36eb0981 2 parents 84c2a3c1 3fbe9d24
trunk/src/app/srs_app_st.cpp
--- a/trunk/src/app/srs_app_st.cpp
查看文件 @36eb098
+++ b/trunk/src/app/srs_app_st.cpp
查看文件 @36eb098
@@ -206,7 +206,7 @@ namespace internal
                 srs_warn("thread %s on before cycle failed, ignored and retry, ret=%d", _name, ret);
                 goto failed;
             }
-            srs_info("thread %s on before cycle success");
+            srs_info("thread %s on before cycle success", _name);
             if ((ret = handler->cycle()) != ERROR_SUCCESS) {
                 if (!srs_is_client_gracefully_close(ret) && !srs_is_system_control_error(ret)) {