Merge pull request #97 from GNURub/keep_hls_m3u8_after_stream_finish

Keep hls after finish stream

configure/liveconfig.go

@@ -44,6 +44,7 @@ type ServerCfg struct {
 	RTMPAddr        string       `mapstructure:"rtmp_addr"`
 	HTTPFLVAddr     string       `mapstructure:"httpflv_addr"`
 	HLSAddr         string       `mapstructure:"hls_addr"`
+	HLSKeepAfterEnd bool         `mapstructure:"hls_keep_after_end"`
 	APIAddr         string       `mapstructure:"api_addr"`
 	RedisAddr       string       `mapstructure:"redis_addr"`
 	RedisPwd        string       `mapstructure:"redis_pwd"`
@@ -51,7 +52,7 @@ type ServerCfg struct {
 	WriteTimeout    int          `mapstructure:"write_timeout"`
 	GopNum          int          `mapstructure:"gop_num"`
 	JWT             JWT          `mapstructure:"jwt"`
-	Server       []Application `mapstructure:"server"`
+	Server          Applications `mapstructure:"server"`
 }
 
 // default config
@@ -60,6 +61,7 @@ var defaultConf = ServerCfg{
 	RTMPAddr:        ":1935",
 	HTTPFLVAddr:     ":7001",
 	HLSAddr:         ":7002",
+	HLSKeepAfterEnd: false,
 	APIAddr:         ":8090",
 	WriteTimeout:    10,
 	ReadTimeout:     10,

livego.yaml

@@ -15,7 +15,6 @@
 
 # # API Options
 # api_addr: ":8090"
-
 server:
 - appname: live
   live: true

protocol/hls/hls.go

@@ -2,6 +2,7 @@ package hls
 
 import (
 	"fmt"
+	"livego/configure"
 	"net"
 	"net/http"
 	"path"
@@ -82,7 +83,7 @@ func (server *Server) checkStop() {
 		<-time.After(5 * time.Second)
 		for item := range server.conns.IterBuffered() {
 			v := item.Val.(*Source)
-			if !v.Alive() {
+			if !v.Alive() && !configure.Config.GetBool("hls_keep_after_end") {
 				log.Debug("check stop and remove: ", v.Info())
 				server.conns.Remove(item.Key)
 			}

protocol/hls/source.go

@@ -3,6 +3,7 @@ package hls
 import (
 	"bytes"
 	"fmt"
+	"livego/configure"
 	"time"
 
 	"livego/av"
@@ -180,7 +181,7 @@ func (source *Source) cleanup() {
 
 func (source *Source) Close(err error) {
 	log.Debug("hls source closed: ", source.info)
-	if !source.closed {
+	if !source.closed && !configure.Config.GetBool("hls_keep_after_end") {
 		source.cleanup()
 	}
 	source.closed = true