Merge pull request gwuhaolin#97 from GNURub/keep_hls_m3u8_after_strea…

…m_finish Keep hls after finish stream
nickoo123 · Apr 28, 2020 · 8c30a7a · 8c30a7a
2 parents dbf26a7 + 40052bb
commit 8c30a7a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/configure/liveconfig.go b/configure/liveconfig.go
@@ -38,32 +38,34 @@ type JWT struct {
 	Algorithm string `mapstructure:"algorithm"`
 }
 type ServerCfg struct {
-	Level        string        `mapstructure:"level"`
-	ConfigFile   string        `mapstructure:"config_file"`
-	FLVDir       string        `mapstructure:"flv_dir"`
-	RTMPAddr     string        `mapstructure:"rtmp_addr"`
-	HTTPFLVAddr  string        `mapstructure:"httpflv_addr"`
-	HLSAddr      string        `mapstructure:"hls_addr"`
-	APIAddr      string        `mapstructure:"api_addr"`
-	RedisAddr    string        `mapstructure:"redis_addr"`
-	RedisPwd     string        `mapstructure:"redis_pwd"`
-	ReadTimeout  int           `mapstructure:"read_timeout"`
-	WriteTimeout int           `mapstructure:"write_timeout"`
-	GopNum       int           `mapstructure:"gop_num"`
-	JWT          JWT           `mapstructure:"jwt"`
-	Server       []Application `mapstructure:"server"`
+	Level           string       `mapstructure:"level"`
+	ConfigFile      string       `mapstructure:"config_file"`
+	FLVDir          string       `mapstructure:"flv_dir"`
+	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"`
+	ReadTimeout     int          `mapstructure:"read_timeout"`
+	WriteTimeout    int          `mapstructure:"write_timeout"`
+	GopNum          int          `mapstructure:"gop_num"`
+	JWT             JWT          `mapstructure:"jwt"`
+	Server          Applications `mapstructure:"server"`
 }
 
 // default config
 var defaultConf = ServerCfg{
-	ConfigFile:   "livego.yaml",
-	RTMPAddr:     ":1935",
-	HTTPFLVAddr:  ":7001",
-	HLSAddr:      ":7002",
-	APIAddr:      ":8090",
-	WriteTimeout: 10,
-	ReadTimeout:  10,
-	GopNum:       1,
+	ConfigFile:      "livego.yaml",
+	RTMPAddr:        ":1935",
+	HTTPFLVAddr:     ":7001",
+	HLSAddr:         ":7002",
+	HLSKeepAfterEnd: false,
+	APIAddr:         ":8090",
+	WriteTimeout:    10,
+	ReadTimeout:     10,
+	GopNum:          1,
 	Server: Applications{{
 		Appname:    "live",
 		Live:       true,

diff --git a/livego.yaml b/livego.yaml
@@ -15,7 +15,6 @@
 
 # # API Options
 # api_addr: ":8090"
-
 server:
 - appname: live
   live: true

diff --git a/protocol/hls/hls.go b/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)
 			}

diff --git a/protocol/hls/source.go b/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