diff --git a/README.md b/README.md index 57964586d..cee802905 100755 --- a/README.md +++ b/README.md @@ -19,13 +19,19 @@ cd simple-rtmp-server-*.*/trunk ./configure --with-ssl --with-hls --with-ffmpeg --with-http make +or get the latest code:
+
+git clone  https://github.com/winlinvip/simple-rtmp-server
+cd simple-rtmp-server/trunk
+./configure --with-ssl --with-hls --with-ffmpeg --with-http
+
step 2: start srs
-./objs/simple_rtmp_server -c conf/srs.conf
+./objs/srs -c conf/srs.conf
 
step 3(optinal): start srs listen at 19350 to forward to
-./objs/simple_rtmp_server -c conf/srs.19350.conf
+./objs/srs -c conf/srs.19350.conf
 
step 4(optional): start nginx for HLS
@@ -82,6 +88,14 @@ rtmp url: rtmp://demo:19350/live/livestream_sd
 m3u8 url: http://demo:80/forward/live/livestream_sd.m3u8
 for android: http://demo:80/forward/live/livestream_sd.html
 
+step 11: modify the config and reload it (all features support reload)
+
+killall -1 srs
+
+or use specified signal name to reload:
+
+killall -s SIGHUP srs
+
### Architecture System Architecture: diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index d7477abf6..ad6f26f11 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -83,7 +83,7 @@ vhost __defaultVhost__ { vhost dev { enabled on; gop_cache on; - forward 127.0.0.1:19350; + #forward 127.0.0.1:19350; hls { hls off; hls_path ./objs/nginx/html; diff --git a/trunk/configure b/trunk/configure index 40455a1de..9d69081a7 100755 --- a/trunk/configure +++ b/trunk/configure @@ -57,11 +57,11 @@ help: @echo " server build the srs(simple rtmp server) over st(state-threads)" clean: - (rm -f Makefile; cd ${SRS_OBJS}; rm -rf Makefile *.hpp src st_*_load) + (rm -f Makefile; cd ${SRS_OBJS}; rm -rf srs Makefile *.hpp src st_*_load) server: _prepare_dir @echo "build the srs(simple rtmp server) over st(state-threads)" - \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} simple_rtmp_server + \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} srs # the ./configure will generate it. _prepare_dir: @@ -87,7 +87,7 @@ GCC = g++ LINK = \$(GCC) AR = ar -.PHONY: default simple_rtmp_server +.PHONY: default srs default: @@ -142,7 +142,7 @@ if [ $SRS_SSL = YES ]; then else LINK_OPTIONS="-ldl" fi -BUILD_KEY="simple_rtmp_server" APP_MAIN="srs_main_server" APP_NAME="simple_rtmp_server" SO_PATH="" . auto/apps.sh +BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh echo 'configure ok! ' @@ -187,4 +187,4 @@ fi if [ $SRS_HTTP = YES ]; then echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" fi -echo "\" ./objs/simple_rtmp_server -c conf/srs.conf \" to start the srs live server" +echo "\" ./objs/srs -c conf/srs.conf \" to start the srs live server"