Skip to content

Commit 006cd93

Browse files
ouqiangouqiang
committed
代码格式化
1 parent eb5d7e2 commit 006cd93

File tree

9 files changed

+529
-532
lines changed

9 files changed

+529
-532
lines changed

‎cmd/cmd.go‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
package cmd
22

33
import (
4-
"flag"
5-
"os"
6-
"net/http"
7-
"github.com/ouqiang/delay-queue/config"
8-
"github.com/ouqiang/delay-queue/routers"
9-
"github.com/ouqiang/delay-queue/delayqueue"
10-
"log"
11-
"fmt"
12-
_ "net/http/pprof"
4+
"flag"
5+
"fmt"
6+
"github.com/ouqiang/delay-queue/config"
7+
"github.com/ouqiang/delay-queue/delayqueue"
8+
"github.com/ouqiang/delay-queue/routers"
9+
"log"
10+
"net/http"
11+
_ "net/http/pprof"
12+
"os"
1313
)
1414

15-
type Cmd struct {}
15+
type Cmd struct{}
1616

1717
var (
18-
version bool
19-
configFile string
18+
version bool
19+
configFile string
2020
)
2121

2222
const (
23-
AppVersion = "0.3"
23+
AppVersion = "0.3"
2424
)
2525

26-
func (cmd *Cmd) Run() {
27-
28-
// 解析命令行参数
29-
cmd.parseCommandArgs();
30-
if version {
31-
fmt.Println(AppVersion)
32-
os.Exit(0)
33-
}
34-
// 初始化配置
35-
config.Init(configFile)
36-
// 初始化队列
37-
delayqueue.Init()
38-
39-
// 运行web server
40-
cmd.runWeb()
26+
func (cmd *Cmd) Run() {
27+
28+
// 解析命令行参数
29+
cmd.parseCommandArgs()
30+
if version {
31+
fmt.Println(AppVersion)
32+
os.Exit(0)
33+
}
34+
// 初始化配置
35+
config.Init(configFile)
36+
// 初始化队列
37+
delayqueue.Init()
38+
39+
// 运行web server
40+
cmd.runWeb()
4141
}
4242

43-
func (cmd *Cmd) parseCommandArgs() {
44-
// 配置文件
45-
flag.StringVar(&configFile, "c", "", "./delay-queue -c /path/to/delay-queue.conf")
46-
// 版本
47-
flag.BoolVar(&version, "v", false, "./delay-queue -v")
48-
flag.Parse()
43+
func (cmd *Cmd) parseCommandArgs() {
44+
// 配置文件
45+
flag.StringVar(&configFile, "c", "", "./delay-queue -c /path/to/delay-queue.conf")
46+
// 版本
47+
flag.BoolVar(&version, "v", false, "./delay-queue -v")
48+
flag.Parse()
4949
}
5050

51-
func (cmd *Cmd) runWeb() {
52-
http.HandleFunc("/push", routers.Push)
53-
http.HandleFunc("/pop", routers.Pop)
54-
http.HandleFunc("/finish", routers.Delete)
55-
http.HandleFunc("/delete", routers.Delete)
56-
57-
log.Printf("listen %s\n", config.Setting.BindAddress)
58-
err := http.ListenAndServe(config.Setting.BindAddress, nil)
59-
if err != nil {
60-
log.Fatalln(err)
61-
}
51+
func (cmd *Cmd) runWeb() {
52+
http.HandleFunc("/push", routers.Push)
53+
http.HandleFunc("/pop", routers.Pop)
54+
http.HandleFunc("/finish", routers.Delete)
55+
http.HandleFunc("/delete", routers.Delete)
56+
57+
log.Printf("listen %s\n", config.Setting.BindAddress)
58+
err := http.ListenAndServe(config.Setting.BindAddress, nil)
59+
if err != nil {
60+
log.Fatalln(err)
61+
}
6262
}

‎config/config.go‎

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,98 @@
11
package config
22

33
import (
4-
"gopkg.in/ini.v1"
5-
"log"
4+
"gopkg.in/ini.v1"
5+
"log"
66
)
77

88
// 解析配置文件
99

1010
var (
11-
Setting *Config
11+
Setting *Config
1212
)
1313

1414
const (
15-
DefaultBindAddress = "0.0.0.0:9277"
16-
DefaultBucketSize = 3
17-
DefaultBucketName = "dq_bucket_%d"
18-
DefaultQueueName = "dq_queue_%s"
19-
DefaultQueueBlockTimeout = 178
20-
DefaultRedisHost = "127.0.0.1:6379"
21-
DefaultRedisDb = 1
22-
DefaultRedisPassword = ""
23-
DefaultRedisMaxIdle = 10
24-
DefaultRedisMaxActive = 0
25-
DefaultRedisConnectTimeout = 5000
26-
DefaultRedisReadTimeout = 180000
27-
DefaultRedisWriteTimeout = 3000
15+
DefaultBindAddress = "0.0.0.0:9277"
16+
DefaultBucketSize = 3
17+
DefaultBucketName = "dq_bucket_%d"
18+
DefaultQueueName = "dq_queue_%s"
19+
DefaultQueueBlockTimeout = 178
20+
DefaultRedisHost = "127.0.0.1:6379"
21+
DefaultRedisDb = 1
22+
DefaultRedisPassword = ""
23+
DefaultRedisMaxIdle = 10
24+
DefaultRedisMaxActive = 0
25+
DefaultRedisConnectTimeout = 5000
26+
DefaultRedisReadTimeout = 180000
27+
DefaultRedisWriteTimeout = 3000
2828
)
2929

3030
type Config struct {
31-
BindAddress string // http server 监听地址
32-
BucketSize int // bucket数量
33-
BucketName string // bucket在redis中的键名,
34-
QueueName string // ready queue在redis中的键名
35-
QueueBlockTimeout int // 调用blpop阻塞超时时间, 单位秒, 修改此项, redis.read_timeout必须做相应调整
36-
Redis RedisConfig // redis配置
31+
BindAddress string // http server 监听地址
32+
BucketSize int // bucket数量
33+
BucketName string // bucket在redis中的键名,
34+
QueueName string // ready queue在redis中的键名
35+
QueueBlockTimeout int // 调用blpop阻塞超时时间, 单位秒, 修改此项, redis.read_timeout必须做相应调整
36+
Redis RedisConfig // redis配置
3737
}
3838

3939
type RedisConfig struct {
40-
Host string
41-
Db int
42-
Password string
43-
MaxIdle int // 连接池最大空闲连接数
44-
MaxActive int // 连接池最大激活连接数
45-
ConnectTimeout int // 连接超时, 单位毫秒
46-
ReadTimeout int // 读取超时, 单位毫秒
47-
WriteTimeout int // 写入超时, 单位毫秒
40+
Host string
41+
Db int
42+
Password string
43+
MaxIdle int // 连接池最大空闲连接数
44+
MaxActive int // 连接池最大激活连接数
45+
ConnectTimeout int // 连接超时, 单位毫秒
46+
ReadTimeout int // 读取超时, 单位毫秒
47+
WriteTimeout int // 写入超时, 单位毫秒
4848
}
4949

50-
func Init(path string) {
51-
Setting = &Config{}
52-
if (path == "") {
53-
Setting.initDefaultConfig()
54-
return
55-
}
50+
func Init(path string) {
51+
Setting = &Config{}
52+
if path == "" {
53+
Setting.initDefaultConfig()
54+
return
55+
}
5656

57-
Setting.parse(path)
57+
Setting.parse(path)
5858
}
5959

60-
func (config *Config) parse(path string) {
61-
file, err := ini.Load(path)
62-
if err != nil {
63-
log.Fatalf("无法解析配置文件#%s", err.Error())
64-
}
60+
func (config *Config) parse(path string) {
61+
file, err := ini.Load(path)
62+
if err != nil {
63+
log.Fatalf("无法解析配置文件#%s", err.Error())
64+
}
6565

66-
section := file.Section("")
67-
config.BindAddress = section.Key("bind_address").MustString(DefaultBindAddress)
68-
config.BucketSize = section.Key("bucket_size").MustInt(DefaultBucketSize)
69-
config.BucketName = section.Key("bucket_name").MustString(DefaultBucketName)
70-
config.QueueName = section.Key("queue_name").MustString(DefaultQueueName)
71-
config.QueueBlockTimeout = section.Key("queue_block_timeout").MustInt(DefaultQueueBlockTimeout)
66+
section := file.Section("")
67+
config.BindAddress = section.Key("bind_address").MustString(DefaultBindAddress)
68+
config.BucketSize = section.Key("bucket_size").MustInt(DefaultBucketSize)
69+
config.BucketName = section.Key("bucket_name").MustString(DefaultBucketName)
70+
config.QueueName = section.Key("queue_name").MustString(DefaultQueueName)
71+
config.QueueBlockTimeout = section.Key("queue_block_timeout").MustInt(DefaultQueueBlockTimeout)
7272

73-
config.Redis.Host = section.Key("redis.host").MustString(DefaultRedisHost)
74-
config.Redis.Db = section.Key("redis.db").MustInt(DefaultRedisDb)
75-
config.Redis.Password = section.Key("redis.password").MustString(DefaultRedisPassword)
76-
config.Redis.MaxIdle = section.Key("redis.max_idle").MustInt(DefaultRedisMaxIdle)
77-
config.Redis.MaxActive = section.Key("redis.max_active").MustInt(DefaultRedisMaxActive)
78-
config.Redis.ConnectTimeout = section.Key("redis.connect_timeout").MustInt(DefaultRedisConnectTimeout)
79-
config.Redis.ReadTimeout = section.Key("redis.read_timeout").MustInt(DefaultRedisReadTimeout)
80-
config.Redis.WriteTimeout = section.Key("redis.write_timeout").MustInt(DefaultRedisWriteTimeout)
73+
config.Redis.Host = section.Key("redis.host").MustString(DefaultRedisHost)
74+
config.Redis.Db = section.Key("redis.db").MustInt(DefaultRedisDb)
75+
config.Redis.Password = section.Key("redis.password").MustString(DefaultRedisPassword)
76+
config.Redis.MaxIdle = section.Key("redis.max_idle").MustInt(DefaultRedisMaxIdle)
77+
config.Redis.MaxActive = section.Key("redis.max_active").MustInt(DefaultRedisMaxActive)
78+
config.Redis.ConnectTimeout = section.Key("redis.connect_timeout").MustInt(DefaultRedisConnectTimeout)
79+
config.Redis.ReadTimeout = section.Key("redis.read_timeout").MustInt(DefaultRedisReadTimeout)
80+
config.Redis.WriteTimeout = section.Key("redis.write_timeout").MustInt(DefaultRedisWriteTimeout)
8181
}
8282

83+
func (config *Config) initDefaultConfig() {
84+
config.BindAddress = DefaultBindAddress
85+
config.BucketSize = DefaultBucketSize
86+
config.BucketName = DefaultBucketName
87+
config.QueueName = DefaultQueueName
88+
config.QueueBlockTimeout = DefaultQueueBlockTimeout
8389

84-
func (config *Config) initDefaultConfig() {
85-
config.BindAddress = DefaultBindAddress
86-
config.BucketSize = DefaultBucketSize
87-
config.BucketName = DefaultBucketName
88-
config.QueueName = DefaultQueueName
89-
config.QueueBlockTimeout = DefaultQueueBlockTimeout
90-
91-
config.Redis.Host = DefaultRedisHost
92-
config.Redis.Db = DefaultRedisDb
93-
config.Redis.Password = DefaultRedisPassword
94-
config.Redis.MaxIdle = DefaultRedisMaxIdle
95-
config.Redis.MaxActive = DefaultRedisMaxActive
96-
config.Redis.ConnectTimeout = DefaultRedisConnectTimeout
97-
config.Redis.ReadTimeout = DefaultRedisReadTimeout
98-
config.Redis.WriteTimeout = DefaultRedisWriteTimeout
99-
}
90+
config.Redis.Host = DefaultRedisHost
91+
config.Redis.Db = DefaultRedisDb
92+
config.Redis.Password = DefaultRedisPassword
93+
config.Redis.MaxIdle = DefaultRedisMaxIdle
94+
config.Redis.MaxActive = DefaultRedisMaxActive
95+
config.Redis.ConnectTimeout = DefaultRedisConnectTimeout
96+
config.Redis.ReadTimeout = DefaultRedisReadTimeout
97+
config.Redis.WriteTimeout = DefaultRedisWriteTimeout
98+
}

‎delayqueue/bucket.go‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
package delayqueue
22

33
import (
4-
"strconv"
4+
"strconv"
55
)
66

77
type BucketItem struct {
8-
timestamp int64
9-
jobId string
8+
timestamp int64
9+
jobId string
1010
}
1111

1212
func pushToBucket(key string, timestamp int64, jobId string) error {
13-
_, err := execRedisCommand("ZADD", key, timestamp, jobId)
13+
_, err := execRedisCommand("ZADD", key, timestamp, jobId)
1414

15-
return err
15+
return err
1616
}
1717

1818
func getFromBucket(key string) (*BucketItem, error) {
19-
value, err := execRedisCommand("ZRANGE", key, 0, 0, "WITHSCORES")
20-
if err != nil {
21-
return nil, err
22-
}
23-
if value == nil {
24-
return nil, nil
25-
}
26-
27-
28-
var valueBytes []interface{}
29-
valueBytes = value.([]interface{})
30-
if len(valueBytes) == 0 {
31-
return nil, nil
32-
}
33-
timestampStr := string(valueBytes[1].([]byte))
34-
item := &BucketItem{}
35-
item.timestamp, err = strconv.ParseInt(timestampStr, 10, 64)
36-
item.jobId = string(valueBytes[0].([]byte))
37-
38-
return item, nil
19+
value, err := execRedisCommand("ZRANGE", key, 0, 0, "WITHSCORES")
20+
if err != nil {
21+
return nil, err
22+
}
23+
if value == nil {
24+
return nil, nil
25+
}
26+
27+
var valueBytes []interface{}
28+
valueBytes = value.([]interface{})
29+
if len(valueBytes) == 0 {
30+
return nil, nil
31+
}
32+
timestampStr := string(valueBytes[1].([]byte))
33+
item := &BucketItem{}
34+
item.timestamp, err = strconv.ParseInt(timestampStr, 10, 64)
35+
item.jobId = string(valueBytes[0].([]byte))
36+
37+
return item, nil
3938
}
4039

41-
func removeFromBucket(bucket string, jobId string) error {
42-
_, err := execRedisCommand("ZREM", bucket, jobId)
40+
func removeFromBucket(bucket string, jobId string) error {
41+
_, err := execRedisCommand("ZREM", bucket, jobId)
4342

44-
return err
45-
}
43+
return err
44+
}

0 commit comments

Comments
 (0)