winlin

warning when join thread failed. 1.0.29

@@ -122,7 +122,9 @@ void SrsThread::stop() @@ -122,7 +122,9 @@ void SrsThread::stop()
122 // wait the thread to exit. 122 // wait the thread to exit.
123 int ret = st_thread_join(tid, NULL); 123 int ret = st_thread_join(tid, NULL);
124 // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. 124 // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated.
125 - srs_assert(ret == 0); 125 + if (ret != 0) {
  126 + srs_warn("join thread failed. code=%d", ret);
  127 + }
126 128
127 tid = NULL; 129 tid = NULL;
128 } 130 }
@@ -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 28 34 +#define VERSION_REVISION 29
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"