Removed rooms in file

configure/channel.go

@@ -1,49 +1,39 @@
 package configure
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/rand"
-	"sync"
-	"time"
 
 	"github.com/go-redis/redis/v7"
+	"github.com/patrickmn/go-cache"
 )
 
-var RoomKeys = LoadRoomKey(*GetKeyFile())
+var RoomKeys *RoomKeysType
 
 var roomUpdated = false
 
-var saveInFile = true
+var saveInLocal = true
-var redisCli *redis.Client
+
+type RoomKeysType struct {
+	redisCli   *redis.Client
+	localCache *cache.Cache
+}
 
 func Init() {
-	saveInFile = GetRedisAddr() == nil
+	saveInLocal = GetRedisAddr() == nil
-
-	rand.Seed(time.Now().UnixNano())
-	if saveInFile {
-		go func() {
-			for {
-				time.Sleep(15 * time.Second)
-				if roomUpdated {
-					RoomKeys.Save(*roomKeySaveFile)
-					roomUpdated = false
-				}
-			}
-		}()
 
-		return
+	RoomKeys = &RoomKeysType{
+		localCache: cache.New(cache.NoExpiration, 0),
 	}
 
-	redisCli = redis.NewClient(&redis.Options{
+	RoomKeys.redisCli = redis.NewClient(&redis.Options{
 		Addr:     *GetRedisAddr(),
 		Password: *GetRedisPwd(),
 		DB:       0,
 	})
 
-	_, err := redisCli.Ping().Result()
+	_, err := RoomKeys.redisCli.Ping().Result()
 	if err != nil {
 		panic(err)
 	}
@@ -51,62 +41,18 @@ func Init() {
 	log.Printf("Redis connected")
 }
 
-type RoomKeysType struct {
-	mapChanKey sync.Map
-	mapKeyChan sync.Map
-}
-
-func LoadRoomKey(f string) *RoomKeysType {
-	result := &RoomKeysType{
-		mapChanKey: sync.Map{},
-		mapKeyChan: sync.Map{},
-	}
-	raw := map[string]string{}
-	content, err := ioutil.ReadFile(f)
-	if err != nil {
-		log.Printf("Failed to read file %s for room keys", f)
-		return result
-	}
-	if json.Unmarshal(content, &raw) != nil {
-		log.Printf("Failed to unmarshal file %s for room keys", f)
-		return result
-	}
-	for room, key := range raw {
-		result.mapChanKey.Store(room, key)
-		result.mapKeyChan.Store(key, room)
-	}
-	return result
-}
-
-func (r *RoomKeysType) Save(f string) {
-	raw := map[string]string{}
-	r.mapChanKey.Range(func(channel, key interface{}) bool {
-		raw[channel.(string)] = key.(string)
-		return true
-	})
-	content, err := json.Marshal(raw)
-	if err != nil {
-		log.Println("Failed to marshal room keys")
-		return
-	}
-	if ioutil.WriteFile(f, content, 0644) != nil {
-		log.Println("Failed to save room keys")
-		return
-	}
-}
-
 // set/reset a random key for channel
 func (r *RoomKeysType) SetKey(channel string) (key string, err error) {
-	if !saveInFile {
+	if !saveInLocal {
 		for {
 			key = randStringRunes(48)
-			if _, err = redisCli.Get(key).Result(); err == redis.Nil {
+			if _, err = r.redisCli.Get(key).Result(); err == redis.Nil {
-				err = redisCli.Set(channel, key, 0).Err()
+				err = r.redisCli.Set(channel, key, 0).Err()
 				if err != nil {
 					return
 				}
 
-				err = redisCli.Set(key, channel, 0).Err()
+				err = r.redisCli.Set(key, channel, 0).Err()
 				return
 			} else if err != nil {
 				return
@@ -116,9 +62,9 @@ func (r *RoomKeysType) SetKey(channel string) (key string, err error) {
 
 	for {
 		key = randStringRunes(48)
-		if _, found := r.mapKeyChan.Load(key); !found {
+		if _, found := r.localCache.Get(key); !found {
-			r.mapChanKey.Store(channel, key)
+			r.localCache.SetDefault(channel, key)
-			r.mapKeyChan.Store(key, channel)
+			r.localCache.SetDefault(key, channel)
 			break
 		}
 	}
@@ -127,8 +73,8 @@ func (r *RoomKeysType) SetKey(channel string) (key string, err error) {
 }
 
 func (r *RoomKeysType) GetKey(channel string) (newKey string, err error) {
-	if !saveInFile {
+	if !saveInLocal {
-		if newKey, err = redisCli.Get(channel).Result(); err == redis.Nil {
+		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)
 			return
@@ -139,7 +85,7 @@ func (r *RoomKeysType) GetKey(channel string) (newKey string, err error) {
 
 	var key interface{}
 	var found bool
-	if key, found = r.mapChanKey.Load(channel); found {
+	if key, found = r.localCache.Get(channel); found {
 		return key.(string), nil
 	}
 	newKey, err = r.SetKey(channel)
@@ -148,11 +94,11 @@ func (r *RoomKeysType) GetKey(channel string) (newKey string, err error) {
 }
 
 func (r *RoomKeysType) GetChannel(key string) (channel string, err error) {
-	if !saveInFile {
+	if !saveInLocal {
-		return redisCli.Get(key).Result()
+		return r.redisCli.Get(key).Result()
 	}
 
-	chann, found := r.mapKeyChan.Load(key)
+	chann, found := r.localCache.Get(key)
 	if found {
 		return chann.(string), nil
 	} else {
@@ -161,28 +107,28 @@ func (r *RoomKeysType) GetChannel(key string) (channel string, err error) {
 }
 
 func (r *RoomKeysType) DeleteChannel(channel string) bool {
-	if !saveInFile {
+	if !saveInLocal {
-		return redisCli.Del(channel).Err() != nil
+		return r.redisCli.Del(channel).Err() != nil
 	}
 
-	key, ok := r.mapChanKey.Load(channel)
+	key, ok := r.localCache.Get(channel)
 	if ok {
-		r.mapChanKey.Delete(channel)
+		r.localCache.Delete(channel)
-		r.mapKeyChan.Delete(key)
+		r.localCache.Delete(key.(string))
 		return true
 	}
 	return false
 }
 
 func (r *RoomKeysType) DeleteKey(key string) bool {
-	if !saveInFile {
+	if !saveInLocal {
-		return redisCli.Del(key).Err() != nil
+		return r.redisCli.Del(key).Err() != nil
 	}
 
-	channel, ok := r.mapKeyChan.Load(key)
+	channel, ok := r.localCache.Get(key)
 	if ok {
-		r.mapChanKey.Delete(channel)
+		r.localCache.Delete(channel.(string))
-		r.mapKeyChan.Delete(key)
+		r.localCache.Delete(key)
 		return true
 	}
 	return false

configure/liveconfig.go

@@ -20,11 +20,11 @@ import (
 }
 */
 var (
-	roomKeySaveFile = flag.String("KeyFile", "room_keys.json", "path to save room keys")
+	redisAddr = flag.String("redis_addr", "", "redis addr to save room keys ex. localhost:6379")
-	redisAddr       = flag.String("redis_addr", "", "redis addr to save room keys ex. localhost:6379")
+	redisPwd  = flag.String("redis_pwd", "", "redis password")
-	redisPwd        = flag.String("redis_pwd", "", "redis password")
+	dashboard = flag.Bool("dashboard", false, "Enable dashboard ui")
-	dashboard       = flag.Bool("dashboard", false, "Enable dashboard ui")
 )
+
 type Application struct {
 	Appname    string   `json:"appname"`
 	Liveon     string   `json:"liveon"`
@@ -68,14 +68,6 @@ func LoadConfig(configfilename string) error {
 	return nil
 }
 
-func GetKeyFile() *string {
-	if len(RtmpServercfg.KeyFile) > 0 {
-		*roomKeySaveFile = RtmpServercfg.KeyFile
-	}
-
-	return roomKeySaveFile
-}
-
 func GetRedisAddr() *string {
 	if len(RtmpServercfg.RedisAddr) > 0 {
 		*redisAddr = RtmpServercfg.RedisAddr

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/gorilla/mux v1.7.4
 	github.com/markbates/pkger v0.15.1
 	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/smartystreets/goconvey v1.6.4 // indirect
 	github.com/stretchr/testify v1.4.0

go.sum

@@ -37,6 +37,8 @@ github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=