Makefile, log system, errors to fmt

.gitignore

@@ -4,3 +4,4 @@ dist
 .vscode
 .tmp
 vendor
+livego

CHANGELOG.md

@@ -13,13 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     {
         "jwt": {
             "secret": "testing",
-            "algorithm": "HS256s"
+            "algorithm": "HS256"
         },
         "server": [
             {
                 "appname": "live",
-                "liveon": "on",
-                "hlson": "on"
+                "live": true,
+                "hls": true
             }
         ]
     }
@@ -32,14 +32,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
         "server": [
             {
                 "appname": "live",
-                "liveon": "on",
-                "hlson": "on"
+                "live": true,
+                "hls": true
             }
         ]
     }
 ```
+- Makefile
 
 ### Changed
 - Show `players`.
 - Show `stream_id`.
 - Deleted keys saved in physical file, now the keys are in cached using `go-cache` by default.
+- Using `logrus` like log system.
+- Using method `.Get(queryParamName)` to get an url query param.
+- Replaced `errors.New(...)` to `fmt.Errorf(...)`.
+- Replaced types string on config params `liveon` and `hlson` to booleans `live: true/false` and `hls: true/false`

Makefile

@@ -0,0 +1,36 @@
+GOCMD ?= go
+GOBUILD = $(GOCMD) build
+GOCLEAN = $(GOCMD) clean
+GOTEST = $(GOCMD) test
+GOGET = $(GOCMD) get
+BINARY_NAME = livego
+BINARY_UNIX = $(BINARY_NAME)_unix
+
+DOCKER_ACC ?= gwuhaolin
+DOCKER_REPO ?= livego
+
+TAG := $(shell git describe --tags --abbrev=0 2>/dev/null)
+
+default: all
+
+all: test build dockerize
+build:
+	$(GOBUILD) -o $(BINARY_NAME) -v -ldflags="-X main.VERSION=$(TAG)"
+
+test:
+	$(GOTEST) -v ./...
+
+clean:
+	$(GOCLEAN)
+	rm -f $(BINARY_NAME)
+	rm -f $(BINARY_UNIX)
+
+run: build
+	./$(BINARY_NAME)
+
+build-linux:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -o $(BINARY_UNIX) -v
+
+dockerize:
+	docker build -t $(DOCKER_ACC)/$(DOCKER_REPO):$(TAG) .
+	docker push $(DOCKER_ACC)/$(DOCKER_REPO):$(TAG)

README.md

@@ -30,7 +30,7 @@ Run `docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -d --name livego gwuhaoli
 
 #### Compile from source
 1. Download the source code `git clone https://github.com/gwuhaolin/livego.git`
-2. Go to the livego directory and execute `go build`
+2. Go to the livego directory and execute `go build` or `make run`
 
 ## Use
 2. Start the service: execute the livego binary file to start the livego service;

configure/channel.go

@@ -2,29 +2,27 @@ package configure
 
 import (
 	"fmt"
-	"log"
 
 	"livego/utils/uid"
 
 	"github.com/go-redis/redis/v7"
 	"github.com/patrickmn/go-cache"
+	log "github.com/sirupsen/logrus"
 )
 
-var RoomKeys *RoomKeysType
-var saveInLocal = true
-
 type RoomKeysType struct {
 	redisCli   *redis.Client
 	localCache *cache.Cache
 }
 
-func Init() {
-	saveInLocal = GetRedisAddr() == nil
+var RoomKeys = &RoomKeysType{
+	localCache: cache.New(cache.NoExpiration, 0),
+}
 
-	RoomKeys = &RoomKeysType{
-		localCache: cache.New(cache.NoExpiration, 0),
-	}
+var saveInLocal = true
 
+func Init() {
+	saveInLocal = GetRedisAddr() == nil
 	if saveInLocal {
 		return
 	}
@@ -37,10 +35,10 @@ func Init() {
 
 	_, err := RoomKeys.redisCli.Ping().Result()
 	if err != nil {
-		panic(err)
+		log.Panic("Redis: ", err)
 	}
 
-	log.Printf("Redis connected")
+	log.Debug("Redis connected")
 }
 
 // set/reset a random key for channel
@@ -77,7 +75,7 @@ func (r *RoomKeysType) GetKey(channel string) (newKey string, err error) {
 	if !saveInLocal {
 		if newKey, err = r.redisCli.Get(channel).Result(); err == redis.Nil {
 			newKey, err = r.SetKey(channel)
-			log.Printf("[KEY] new channel [%s]: %s", channel, newKey)
+			log.Debugf("[KEY] new channel [%s]: %s", channel, newKey)
 			return
 		}
 
@@ -90,7 +88,7 @@ func (r *RoomKeysType) GetKey(channel string) (newKey string, err error) {
 		return key.(string), nil
 	}
 	newKey, err = r.SetKey(channel)
-	log.Printf("[KEY] new channel [%s]: %s", channel, newKey)
+	log.Debugf("[KEY] new channel [%s]: %s", channel, newKey)
 	return
 }
 

configure/liveconfig.go

@@ -4,16 +4,17 @@ import (
 	"encoding/json"
 	"flag"
 	"io/ioutil"
-	"log"
+
+	log "github.com/sirupsen/logrus"
 )
 
 /*
 {
   "server": [
     {
       "appname": "live",
-      "liveon": "on",
-	  "hlson": "on",
+      "live": true,
+	  "hls": true,
 	  "static_push": []
     }
   ]
@@ -26,8 +27,8 @@ var (
 
 type Application struct {
 	Appname    string   `json:"appname"`
-	Liveon     string   `json:"liveon"`
-	Hlson      string   `json:"hlson"`
+	Live       bool     `json:"liveon"`
+	Hls        bool     `json:"hls"`
 	StaticPush []string `json:"static_push"`
 }
 type JWTCfg struct {
@@ -45,26 +46,29 @@ type ServerCfg struct {
 var RtmpServercfg = ServerCfg{
 	Server: []Application{{
 		Appname:    "livego",
-		Liveon:     "on",
-		Hlson:      "on",
+		Live:       true,
+		Hls:        true,
 		StaticPush: nil,
 	}},
 }
 
 func LoadConfig(configfilename string) {
-	log.Printf("starting load configure file %s", configfilename)
+	defer Init()
+
+	log.Infof("starting load configure file %s", configfilename)
 	data, err := ioutil.ReadFile(configfilename)
 	if err != nil {
-		log.Printf("ReadFile %s error:%v", configfilename, err)
+		log.Warningf("ReadFile %s error:%v", configfilename, err)
+		log.Info("Using default config")
+		return
 	}
 
 	err = json.Unmarshal(data, &RtmpServercfg)
 	if err != nil {
-		log.Printf("json.Unmarshal error:%v", err)
+		log.Errorf("json.Unmarshal error:%v", err)
+		log.Info("Using default config")
 	}
-	log.Printf("get config json data:%v", RtmpServercfg)
-
-	Init()
+	log.Debugf("get config json data:%v", RtmpServercfg)
 }
 
 func GetRedisAddr() *string {
@@ -89,16 +93,16 @@ func GetRedisPwd() *string {
 
 func CheckAppName(appname string) bool {
 	for _, app := range RtmpServercfg.Server {
-		if (app.Appname == appname) && (app.Liveon == "on") {
-			return true
+		if app.Appname == appname {
+			return app.Live
 		}
 	}
 	return false
 }
 
 func GetStaticPushUrlList(appname string) ([]string, bool) {
 	for _, app := range RtmpServercfg.Server {
-		if (app.Appname == appname) && (app.Liveon == "on") {
+		if (app.Appname == appname) && app.Live {
 			if len(app.StaticPush) > 0 {
 				return app.StaticPush, true
 			} else {

container/flv/demuxer.go

@@ -1,13 +1,12 @@
 package flv
 
 import (
-	"errors"
-
+	"fmt"
 	"livego/av"
 )
 
 var (
-	ErrAvcEndSEQ = errors.New("avc end sequence")
+	ErrAvcEndSEQ = fmt.Errorf("avc end sequence")
 )
 
 type Demuxer struct {

container/flv/muxer.go

@@ -3,7 +3,6 @@ package flv
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"path"
 	"strings"
@@ -13,6 +12,8 @@ import (
 	"livego/protocol/amf"
 	"livego/utils/pio"
 	"livego/utils/uid"
+
+	log "github.com/sirupsen/logrus"
 )
 
 var (
@@ -25,13 +26,13 @@ func NewFlv(handler av.Handler, info av.Info) {
 	patths := strings.SplitN(info.Key, "/", 2)
 
 	if len(patths) != 2 {
-		log.Println("invalid info")
+		log.Warning("invalid info")
 		return
 	}
 
 	w, err := os.OpenFile(*flvFile, os.O_CREATE|os.O_RDWR, 0755)
 	if err != nil {
-		log.Println("open file error: ", err)
+		log.Error("open file error: ", err)
 	}
 
 	writer := NewFLVWriter(patths[0], patths[1], info.URL, w)
@@ -40,7 +41,7 @@ func NewFlv(handler av.Handler, info av.Info) {
 
 	writer.Wait()
 	// close flv file
-	log.Println("close flv file")
+	log.Debug("close flv file")
 	writer.ctx.Close()
 }
 */
@@ -147,25 +148,25 @@ type FlvDvr struct{}
 func (f *FlvDvr) GetWriter(info av.Info) av.WriteCloser {
 	paths := strings.SplitN(info.Key, "/", 2)
 	if len(paths) != 2 {
-		log.Println("invalid info")
+		log.Warning("invalid info")
 		return nil
 	}
 
 	err := os.MkdirAll(path.Join(*flvDir, paths[0]), 0755)
 	if err != nil {
-		log.Println("mkdir error:", err)
+		log.Error("mkdir error: ", err)
 		return nil
 	}
 
 	fileName := fmt.Sprintf("%s_%d.%s", path.Join(*flvDir, info.Key), time.Now().Unix(), "flv")
-	log.Println("flv dvr save stream to: ", fileName)
+	log.Debug("flv dvr save stream to: ", fileName)
 	w, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR, 0755)
 	if err != nil {
-		log.Println("open file error: ", err)
+		log.Error("open file error: ", err)
 		return nil
 	}
 
 	writer := NewFLVWriter(paths[0], paths[1], info.URL, w)
-	log.Println("new flv dvr: ", writer.Info())
+	log.Debug("new flv dvr: ", writer.Info())
 	return writer
 }

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/satori/go.uuid v1.2.0
+	github.com/sirupsen/logrus v1.5.0
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/stretchr/testify v1.4.0
 	github.com/urfave/negroni v1.0.0 // indirect

go.sum

@@ -1,7 +1,8 @@
 github.com/auth0/go-jwt-middleware v0.0.0-20190805220309-36081240882b h1:CvoEHGmxWl5kONC5icxwqV899dkf4VjOScbxLpllEnw=
 github.com/auth0/go-jwt-middleware v0.0.0-20190805220309-36081240882b/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -19,6 +20,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -37,11 +40,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
@@ -54,6 +60,7 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=