60 Commits

Author SHA1 Message Date
joy.zhou
c7573dbb42 fixed 2019-07-25 16:00:41 +08:00
joy.zhou
671564046c update 2019-07-25 15:56:59 +08:00
joy.zhou
e71e1ac401 update 2019-07-25 13:50:14 +08:00
joy.zhou
fa7f984903 update 2019-07-25 13:47:27 +08:00
joy.zhou
cab26d502a upade 2019-07-25 11:30:50 +08:00
joy.zhou
637da9df50 fix 2019-07-23 15:47:01 +08:00
joy.zhou
13fc3bb259 fixed 2019-07-18 15:18:15 +08:00
joy.zhou
dd6ff28d59 fixed 2019-07-18 14:00:03 +08:00
joy.zhou
a103bc4f8f update 2019-07-18 11:01:47 +08:00
joy.zhou
35b74ed924 added 2019-07-18 10:32:58 +08:00
joy.zhou
f69ad324db update readme 2019-07-16 18:15:56 +08:00
joy.zhou
2c17281796 update 2019-07-16 18:12:33 +08:00
joy.zhou
62ca616d0a update auth 2019-07-16 17:51:08 +08:00
joy.zhou
c5ba2aace9 update 2019-07-16 17:49:04 +08:00
joy.zhou
9ca49de6c8 format 2019-07-16 17:43:31 +08:00
joy.zhou
a9b4773516 update 2019-07-16 15:21:20 +08:00
joy.zhou
f671e9f4b7 add log 2019-07-16 15:17:01 +08:00
joy.zhou
43d390357a update key 2019-07-16 14:52:16 +08:00
joy.zhou
f2b8f88ad4 fixed 2019-07-16 14:49:25 +08:00
joy.zhou
33af1a59c4 add 2019-07-16 13:56:32 +08:00
joy.zhou
aa7ce29044 update 2019-07-16 13:40:04 +08:00
joy.zhou
9fbc35fadd fixed 2019-07-15 20:22:40 +08:00
joy.zhou
67e39710e9 update 2019-07-15 19:32:59 +08:00
joy.zhou
a3edbcc2ce dd 2019-07-15 19:22:57 +08:00
joy.zhou
1586a67dde ddd 2019-07-15 19:19:00 +08:00
joy.zhou
0980109fdf dd 2019-07-15 19:15:02 +08:00
joy.zhou
bc89aab452 dd 2019-07-15 19:12:02 +08:00
joy.zhou
f3c30b1c94 fixed res 2019-07-15 19:06:46 +08:00
joy.zhou
9fef7b668d fixed 2019-07-15 18:29:45 +08:00
joy.zhou
e945b35c91 change acl 2019-07-15 18:21:12 +08:00
joy.zhou
e09891eea6 fixed 2019-07-15 17:51:11 +08:00
joy.zhou
9d0daef2cd disable trace 2019-07-15 17:37:48 +08:00
joy.zhou
ec528c6bdc update 2019-07-15 17:20:44 +08:00
joy.zhou
e1ae5ce83d fixed 2019-07-15 16:52:40 +08:00
joy.zhou
e675d1fe9c update 2019-07-15 15:20:18 +08:00
joy.zhou
22f9764220 add config for work chan 2019-07-15 15:10:56 +08:00
joy.zhou
f15d0db08a resp 2019-07-15 14:16:26 +08:00
joy.zhou
8e0ba7cf19 add http api 2019-07-15 14:12:57 +08:00
joy.zhou
4de3f04592 add http api 2019-07-15 14:08:29 +08:00
joy.zhou
46766d1292 fix config 2019-07-15 13:49:31 +08:00
joy.zhou
104d05f46e update 2019-07-15 12:47:33 +08:00
joy.zhou
1ea2dcab88 fixed 2019-07-15 12:11:38 +08:00
joy.zhou
333819b2f2 update 2019-07-15 12:07:37 +08:00
joy.zhou
cd4c1a5a3a add log 2019-07-15 11:53:54 +08:00
joy.zhou
0320ab4c96 fixed 2019-07-15 10:47:02 +08:00
joy.zhou
ac456fd04a remove 2019-07-15 10:39:52 +08:00
joy.zhou
c5a99e0a4e fixed 2019-07-15 10:37:49 +08:00
joy.zhou
c547737ada update 2019-07-12 20:08:37 +08:00
joy.zhou
8e3bc82649 update 2019-07-12 20:00:03 +08:00
joy.zhou
fdf8bfaac6 update 2019-07-12 19:39:27 +08:00
joy.zhou
8c8d1bb836 plugins 2019-07-12 19:22:47 +08:00
joy.zhou
96ce0004c5 plugins 2019-07-12 19:20:21 +08:00
joy.zhou
eca34813bf update 2019-07-12 18:39:59 +08:00
joy.zhou
c394ee47d2 update 2019-07-12 17:55:23 +08:00
joy.zhou
1b3ebe3849 add deploy 2019-07-12 17:31:18 +08:00
joy.zhou
ee70cf1b68 update dockerfile 2019-07-12 17:11:43 +08:00
joy.zhou
21d7125c58 add feature 2019-07-12 16:47:35 +08:00
joy.zhou
3eea49cd42 add acl 2019-07-11 14:52:53 +08:00
joy.zhou
9067eb88b2 update 2019-07-11 12:39:13 +08:00
joy.zhou
7bce53fa2b modify 2019-07-10 20:34:15 +08:00
4 changed files with 52 additions and 19 deletions

View File

@@ -62,6 +62,10 @@ func newMessagePool() []chan *Message {
}
func NewBroker(config *Config) (*Broker, error) {
if config == nil {
config = DefaultConfig
}
b := &Broker{
id: GenUniqueId(),
config: config,

View File

@@ -54,7 +54,7 @@ var DefaultConfig *Config = &Config{
}
var (
log *zap.Logger
log = logger.Prod().Named("broker")
)
func showHelp() {
@@ -118,8 +118,9 @@ func ConfigureConfig(args []string) (*Config, error) {
}
}
logger.InitLogger(config.Debug)
log = logger.Get().Named("Broker")
if config.Debug {
log = logger.Debug().Named("broker")
}
if err := config.check(); err != nil {
return nil, err

29
cmd/broker/main.go Normal file
View File

@@ -0,0 +1,29 @@
package main
import (
"log"
"os"
"os/signal"
"github.com/fhmq/hmq/broker"
)
func main() {
b, err := broker.NewBroker(nil)
if err != nil {
log.Fatal("New Broker error: ", err)
}
b.Start()
s := waitForSignal()
log.Println("signal received, broker closed.", s)
}
func waitForSignal() os.Signal {
signalChan := make(chan os.Signal, 1)
defer close(signalChan)
signal.Notify(signalChan, os.Kill, os.Interrupt)
s := <-signalChan
signal.Stop(signalChan)
return s
}

View File

@@ -29,28 +29,27 @@ func NewProdLogger() (*zap.Logger, error) {
return logCfg.Build()
}
func InitLogger(debug bool) {
var err error
var log *zap.Logger
if debug {
log, err = NewDevLogger()
} else {
log, err = NewProdLogger()
}
if err != nil {
panic("Unable to create a logger.")
}
defer log.Sync()
func Prod() *zap.Logger {
log.Debug("Logger initialization succeeded")
instance = log.Named("hmq")
l, _ := NewProdLogger()
instance = l
return instance
}
func Debug() *zap.Logger {
l, _ := NewDevLogger()
instance = l
return instance
}
// Get return a *zap.Logger instance
func Get() *zap.Logger {
if instance == nil {
l, _ := NewProdLogger()
return l
instance = l
}
return instance
}