Feature #58 support BoltDB engine

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
Bo-Yi Wu 2016-04-23 15:13:57 +08:00
parent f14d42d9a8
commit f5857f54b0
6 changed files with 108 additions and 26 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ coverage.out
gorush/log/*.log gorush/log/*.log
build.tar.gz build.tar.gz
gorush.tar.gz gorush.tar.gz
gorush.db

View File

@ -60,11 +60,14 @@ log:
error_level: "error" error_level: "error"
stat: stat:
engine: "memory" # support memory or redis engine: "memory" # support memory, redis or boltdb
redis: redis:
addr: "localhost:6379" addr: "localhost:6379"
password: "" password: ""
db: 0 db: 0
boltdb:
path: "gorush.db"
bucket: "gorush"
``` ```
## Basic Usage ## Basic Usage

View File

@ -37,3 +37,6 @@ stat:
addr: "localhost:6379" addr: "localhost:6379"
password: "" password: ""
db: 0 db: 0
boltdb:
path: "gorush.db"
bucket: "gorush"

View File

@ -63,6 +63,7 @@ type SectionLog struct {
type SectionStat struct { type SectionStat struct {
Engine string `yaml:"service"` Engine string `yaml:"service"`
Redis SectionRedis `yaml:"redis"` Redis SectionRedis `yaml:"redis"`
BoltDB SectionBoltDB `yaml:"boltdb"`
} }
// SectionRedis is sub seciont of config. // SectionRedis is sub seciont of config.
@ -72,6 +73,12 @@ type SectionRedis struct {
DB int64 `yaml:"db"` DB int64 `yaml:"db"`
} }
// SectionBoltDB is sub seciont of config.
type SectionBoltDB struct {
Path string `yaml:"path"`
Bucket string `yaml:"bucket"`
}
// BuildDefaultPushConf is default config setting. // BuildDefaultPushConf is default config setting.
func BuildDefaultPushConf() ConfYaml { func BuildDefaultPushConf() ConfYaml {
var conf ConfYaml var conf ConfYaml
@ -114,6 +121,9 @@ func BuildDefaultPushConf() ConfYaml {
conf.Stat.Redis.Password = "" conf.Stat.Redis.Password = ""
conf.Stat.Redis.DB = 0 conf.Stat.Redis.DB = 0
conf.Stat.BoltDB.Path = "gorush.db"
conf.Stat.BoltDB.Bucket = "gorush"
return conf return conf
} }

View File

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"sync/atomic" "sync/atomic"
"github.com/asdine/storm"
) )
// StatusApp is app status structure // StatusApp is app status structure
@ -69,6 +70,14 @@ func initRedis() error {
return nil return nil
} }
func initBoltDB() {
RushStatus.TotalCount = getTotalCount()
RushStatus.Ios.PushSuccess = getIosSuccess()
RushStatus.Ios.PushError = getIosError()
RushStatus.Android.PushSuccess = getAndroidSuccess()
RushStatus.Android.PushError = getAndroidError()
}
// InitAppStatus for initialize app status // InitAppStatus for initialize app status
func InitAppStatus() { func InitAppStatus() {
switch PushConf.Stat.Engine { switch PushConf.Stat.Engine {
@ -76,18 +85,34 @@ func InitAppStatus() {
initApp() initApp()
case "redis": case "redis":
initRedis() initRedis()
case "boltdb":
initBoltDB()
default: default:
initApp() initApp()
} }
} }
func boltdbSet(key string, count int64) {
db, _ := storm.Open(PushConf.Stat.BoltDB.Path)
db.Set(PushConf.Stat.BoltDB.Bucket, key, count)
defer db.Close()
}
func boltdbGet(key string, count *int64) {
db, _ := storm.Open(PushConf.Stat.BoltDB.Path)
db.Get(PushConf.Stat.BoltDB.Bucket, key, count)
defer db.Close()
}
func addTotalCount(count int64) { func addTotalCount(count int64) {
switch PushConf.Stat.Engine { switch PushConf.Stat.Engine {
case "memory": case "memory":
atomic.AddInt64(&RushStatus.TotalCount, count) atomic.AddInt64(&RushStatus.TotalCount, count)
case "redis": case "redis":
RedisClient.Set(gorushTotalCount, strconv.Itoa(int(count)), 0) RedisClient.Set(gorushTotalCount, strconv.Itoa(int(count)), 0)
case "boltdb":
boltdbSet(gorushTotalCount, count)
default: default:
atomic.AddInt64(&RushStatus.TotalCount, count) atomic.AddInt64(&RushStatus.TotalCount, count)
} }
@ -99,6 +124,8 @@ func addIosSuccess(count int64) {
atomic.AddInt64(&RushStatus.Ios.PushSuccess, count) atomic.AddInt64(&RushStatus.Ios.PushSuccess, count)
case "redis": case "redis":
RedisClient.Set(gorushIosSuccess, strconv.Itoa(int(count)), 0) RedisClient.Set(gorushIosSuccess, strconv.Itoa(int(count)), 0)
case "boltdb":
boltdbSet(gorushIosSuccess, count)
default: default:
atomic.AddInt64(&RushStatus.Ios.PushSuccess, count) atomic.AddInt64(&RushStatus.Ios.PushSuccess, count)
} }
@ -110,6 +137,8 @@ func addIosError(count int64) {
atomic.AddInt64(&RushStatus.Ios.PushError, count) atomic.AddInt64(&RushStatus.Ios.PushError, count)
case "redis": case "redis":
RedisClient.Set(gorushIosError, strconv.Itoa(int(count)), 0) RedisClient.Set(gorushIosError, strconv.Itoa(int(count)), 0)
case "boltdb":
boltdbSet(gorushIosError, count)
default: default:
atomic.AddInt64(&RushStatus.Ios.PushError, count) atomic.AddInt64(&RushStatus.Ios.PushError, count)
} }
@ -120,8 +149,9 @@ func addAndroidSuccess(count int64) {
case "memory": case "memory":
atomic.AddInt64(&RushStatus.Android.PushSuccess, count) atomic.AddInt64(&RushStatus.Android.PushSuccess, count)
case "redis": case "redis":
RedisClient.Set(gorushAndroidSuccess, strconv.Itoa(int(count)), 0) RedisClient.Set(gorushAndroidSuccess, strconv.Itoa(int(count)), 0)
case "boltdb":
boltdbSet(gorushAndroidSuccess, count)
default: default:
atomic.AddInt64(&RushStatus.Android.PushSuccess, count) atomic.AddInt64(&RushStatus.Android.PushSuccess, count)
} }
@ -133,6 +163,8 @@ func addAndroidError(count int64) {
atomic.AddInt64(&RushStatus.Android.PushError, count) atomic.AddInt64(&RushStatus.Android.PushError, count)
case "redis": case "redis":
RedisClient.Set(gorushAndroidError, strconv.Itoa(int(count)), 0) RedisClient.Set(gorushAndroidError, strconv.Itoa(int(count)), 0)
case "boltdb":
boltdbSet(gorushAndroidError, count)
default: default:
atomic.AddInt64(&RushStatus.Android.PushError, count) atomic.AddInt64(&RushStatus.Android.PushError, count)
} }
@ -144,7 +176,9 @@ func getTotalCount() int64 {
case "memory": case "memory":
count = atomic.LoadInt64(&RushStatus.TotalCount) count = atomic.LoadInt64(&RushStatus.TotalCount)
case "redis": case "redis":
count = getRedisInt64Result(gorushAndroidError) count = getRedisInt64Result(gorushTotalCount)
case "boltdb":
boltdbGet(gorushTotalCount, &count)
default: default:
count = atomic.LoadInt64(&RushStatus.TotalCount) count = atomic.LoadInt64(&RushStatus.TotalCount)
} }
@ -158,7 +192,9 @@ func getIosSuccess() int64 {
case "memory": case "memory":
count = atomic.LoadInt64(&RushStatus.Ios.PushSuccess) count = atomic.LoadInt64(&RushStatus.Ios.PushSuccess)
case "redis": case "redis":
count = getRedisInt64Result(gorushAndroidError) count = getRedisInt64Result(gorushIosSuccess)
case "boltdb":
boltdbGet(gorushIosSuccess, &count)
default: default:
count = atomic.LoadInt64(&RushStatus.Ios.PushSuccess) count = atomic.LoadInt64(&RushStatus.Ios.PushSuccess)
} }
@ -172,7 +208,9 @@ func getIosError() int64 {
case "memory": case "memory":
count = atomic.LoadInt64(&RushStatus.Ios.PushError) count = atomic.LoadInt64(&RushStatus.Ios.PushError)
case "redis": case "redis":
count = getRedisInt64Result(gorushAndroidError) count = getRedisInt64Result(gorushIosError)
case "boltdb":
boltdbGet(gorushIosError, &count)
default: default:
count = atomic.LoadInt64(&RushStatus.Ios.PushError) count = atomic.LoadInt64(&RushStatus.Ios.PushError)
} }
@ -186,7 +224,9 @@ func getAndroidSuccess() int64 {
case "memory": case "memory":
count = atomic.LoadInt64(&RushStatus.Android.PushSuccess) count = atomic.LoadInt64(&RushStatus.Android.PushSuccess)
case "redis": case "redis":
count = getRedisInt64Result(gorushAndroidError) count = getRedisInt64Result(gorushAndroidSuccess)
case "boltdb":
boltdbGet(gorushAndroidSuccess, &count)
default: default:
count = atomic.LoadInt64(&RushStatus.Android.PushSuccess) count = atomic.LoadInt64(&RushStatus.Android.PushSuccess)
} }
@ -201,6 +241,8 @@ func getAndroidError() int64 {
count = atomic.LoadInt64(&RushStatus.Android.PushError) count = atomic.LoadInt64(&RushStatus.Android.PushError)
case "redis": case "redis":
count = getRedisInt64Result(gorushAndroidError) count = getRedisInt64Result(gorushAndroidError)
case "boltdb":
boltdbGet(gorushAndroidError, &count)
default: default:
count = atomic.LoadInt64(&RushStatus.Android.PushError) count = atomic.LoadInt64(&RushStatus.Android.PushError)
} }

View File

@ -73,22 +73,22 @@ func TestStatForRedisEngine(t *testing.T) {
PushConf.Stat.Redis.Addr = "localhost:6379" PushConf.Stat.Redis.Addr = "localhost:6379"
InitAppStatus() InitAppStatus()
addTotalCount(1000) addTotalCount(10)
addIosSuccess(1000) addIosSuccess(20)
addIosError(1000) addIosError(30)
addAndroidSuccess(1000) addAndroidSuccess(40)
addAndroidError(1000) addAndroidError(50)
val = getTotalCount() val = getTotalCount()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(10), val)
val = getIosSuccess() val = getIosSuccess()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(20), val)
val = getIosError() val = getIosError()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(30), val)
val = getAndroidSuccess() val = getAndroidSuccess()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(40), val)
val = getAndroidError() val = getAndroidError()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(50), val)
} }
func TestDefaultEngine(t *testing.T) { func TestDefaultEngine(t *testing.T) {
@ -96,20 +96,43 @@ func TestDefaultEngine(t *testing.T) {
PushConf.Stat.Engine = "test" PushConf.Stat.Engine = "test"
InitAppStatus() InitAppStatus()
addTotalCount(1000) addTotalCount(1)
addIosSuccess(1000) addIosSuccess(2)
addIosError(1000) addIosError(3)
addAndroidSuccess(1000) addAndroidSuccess(4)
addAndroidError(1000) addAndroidError(5)
val = getTotalCount() val = getTotalCount()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(1), val)
val = getIosSuccess() val = getIosSuccess()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(2), val)
val = getIosError() val = getIosError()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(3), val)
val = getAndroidSuccess() val = getAndroidSuccess()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(4), val)
val = getAndroidError() val = getAndroidError()
assert.Equal(t, int64(1000), val) assert.Equal(t, int64(5), val)
}
func TestStatForBoltDBEngine(t *testing.T) {
var val int64
PushConf.Stat.Engine = "boltdb"
InitAppStatus()
addTotalCount(100)
addIosSuccess(200)
addIosError(300)
addAndroidSuccess(400)
addAndroidError(500)
val = getTotalCount()
assert.Equal(t, int64(100), val)
val = getIosSuccess()
assert.Equal(t, int64(200), val)
val = getIosError()
assert.Equal(t, int64(300), val)
val = getAndroidSuccess()
assert.Equal(t, int64(400), val)
val = getAndroidError()
assert.Equal(t, int64(500), val)
} }