Fix typo, delete unused file (#141)
This commit is contained in:
1 parent
332c8a59f7
commit
de0cfc6683
2 files changed
+7
-173
No files matched your search
@@ -11,7 +11,7 @@ import (
|
|||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
type kafakConfig struct {
|
type kafkaConfig struct {
|
||||||
Addr []string `json:"addr"`
|
Addr []string `json:"addr"`
|
||||||
ConnectTopic string `json:"onConnect"`
|
ConnectTopic string `json:"onConnect"`
|
||||||
SubscribeTopic string `json:"onSubscribe"`
|
SubscribeTopic string `json:"onSubscribe"`
|
||||||
@@ -22,11 +22,11 @@ type kafakConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type kafka struct {
|
type kafka struct {
|
||||||
kafakConfig kafakConfig
|
kafkaConfig kafkaConfig
|
||||||
kafkaClient sarama.AsyncProducer
|
kafkaClient sarama.AsyncProducer
|
||||||
}
|
}
|
||||||
|
|
||||||
//Init init kafak client
|
// InitKafka Init kafka client
|
||||||
func InitKafka() *kafka {
|
func InitKafka() *kafka {
|
||||||
log.Info("start connect kafka....")
|
log.Info("start connect kafka....")
|
||||||
content, err := ioutil.ReadFile("./plugins/kafka/kafka.json")
|
content, err := ioutil.ReadFile("./plugins/kafka/kafka.json")
|
||||||
@@ -34,12 +34,12 @@ func InitKafka() *kafka {
|
|||||||
log.Fatal("Read config file error: ", zap.Error(err))
|
log.Fatal("Read config file error: ", zap.Error(err))
|
||||||
}
|
}
|
||||||
// log.Info(string(content))
|
// log.Info(string(content))
|
||||||
var config kafakConfig
|
var config kafkaConfig
|
||||||
err = json.Unmarshal(content, &config)
|
err = json.Unmarshal(content, &config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Unmarshal config file error: ", zap.Error(err))
|
log.Fatal("Unmarshal config file error: ", zap.Error(err))
|
||||||
}
|
}
|
||||||
c := &kafka{kafakConfig: config}
|
c := &kafka{kafkaConfig: config}
|
||||||
c.connect()
|
c.connect()
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
@@ -48,7 +48,7 @@ func InitKafka() *kafka {
|
|||||||
func (k *kafka) connect() {
|
func (k *kafka) connect() {
|
||||||
conf := sarama.NewConfig()
|
conf := sarama.NewConfig()
|
||||||
conf.Version = sarama.V1_1_1_0
|
conf.Version = sarama.V1_1_1_0
|
||||||
kafkaClient, err := sarama.NewAsyncProducer(k.kafakConfig.Addr, conf)
|
kafkaClient, err := sarama.NewAsyncProducer(k.kafkaConfig.Addr, conf)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("create kafka async producer failed: ", zap.Error(err))
|
log.Fatal("create kafka async producer failed: ", zap.Error(err))
|
||||||
}
|
}
|
||||||
@@ -64,7 +64,7 @@ func (k *kafka) connect() {
|
|||||||
|
|
||||||
//Publish publish to kafka
|
//Publish publish to kafka
|
||||||
func (k *kafka) Publish(e *Elements) error {
|
func (k *kafka) Publish(e *Elements) error {
|
||||||
config := k.kafakConfig
|
config := k.kafkaConfig
|
||||||
key := e.ClientID
|
key := e.ClientID
|
||||||
topics := make(map[string]bool)
|
topics := make(map[string]bool)
|
||||||
switch e.Action {
|
switch e.Action {
|
||||||
|
|||||||
-166
@@ -1,166 +0,0 @@
|
|||||||
package pool
|
|
||||||
|
|
||||||
// import "time"
|
|
||||||
|
|
||||||
// const (
|
|
||||||
// // This value is the size of the queue that workers register their
|
|
||||||
// // availability to the dispatcher. There may be hundreds of workers, but
|
|
||||||
// // only a small channel is needed to register some of the workers.
|
|
||||||
// readyQueueSize = 64
|
|
||||||
|
|
||||||
// // If worker pool receives no new work for this period of time, then stop
|
|
||||||
// // a worker goroutine.
|
|
||||||
// idleTimeoutSec = 5
|
|
||||||
// )
|
|
||||||
|
|
||||||
// type WorkerPool struct {
|
|
||||||
// maxWorkers int
|
|
||||||
// timeout time.Duration
|
|
||||||
// taskQueue chan func()
|
|
||||||
// readyWorkers chan chan func()
|
|
||||||
// stoppedChan chan struct{}
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func New(maxWorkers int) *WorkerPool {
|
|
||||||
// // There must be at least one worker.
|
|
||||||
// if maxWorkers < 1 {
|
|
||||||
// maxWorkers = 1
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // taskQueue is unbuffered since items are always removed immediately.
|
|
||||||
// pool := &WorkerPool{
|
|
||||||
// taskQueue: make(chan func()),
|
|
||||||
// maxWorkers: maxWorkers,
|
|
||||||
// readyWorkers: make(chan chan func(), readyQueueSize),
|
|
||||||
// timeout: time.Second * idleTimeoutSec,
|
|
||||||
// stoppedChan: make(chan struct{}),
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // Start the task dispatcher.
|
|
||||||
// go pool.dispatch()
|
|
||||||
|
|
||||||
// return pool
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func (p *WorkerPool) Stop() {
|
|
||||||
// if p.Stopped() {
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// close(p.taskQueue)
|
|
||||||
// <-p.stoppedChan
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func (p *WorkerPool) Stopped() bool {
|
|
||||||
// select {
|
|
||||||
// case <-p.stoppedChan:
|
|
||||||
// return true
|
|
||||||
// default:
|
|
||||||
// }
|
|
||||||
// return false
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func (p *WorkerPool) Submit(task func()) {
|
|
||||||
// if task != nil {
|
|
||||||
// p.taskQueue <- task
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func (p *WorkerPool) SubmitWait(task func()) {
|
|
||||||
// if task == nil {
|
|
||||||
// return
|
|
||||||
// }
|
|
||||||
// doneChan := make(chan struct{})
|
|
||||||
// p.taskQueue <- func() {
|
|
||||||
// task()
|
|
||||||
// close(doneChan)
|
|
||||||
// }
|
|
||||||
// <-doneChan
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func (p *WorkerPool) dispatch() {
|
|
||||||
// defer close(p.stoppedChan)
|
|
||||||
// timeout := time.NewTimer(p.timeout)
|
|
||||||
// var workerCount int
|
|
||||||
// var task func()
|
|
||||||
// var ok bool
|
|
||||||
// var workerTaskChan chan func()
|
|
||||||
// startReady := make(chan chan func())
|
|
||||||
// Loop:
|
|
||||||
// for {
|
|
||||||
// timeout.Reset(p.timeout)
|
|
||||||
// select {
|
|
||||||
// case task, ok = <-p.taskQueue:
|
|
||||||
// if !ok {
|
|
||||||
// break Loop
|
|
||||||
// }
|
|
||||||
// // Got a task to do.
|
|
||||||
// select {
|
|
||||||
// case workerTaskChan = <-p.readyWorkers:
|
|
||||||
// // A worker is ready, so give task to worker.
|
|
||||||
// workerTaskChan <- task
|
|
||||||
// default:
|
|
||||||
// // No workers ready.
|
|
||||||
// // Create a new worker, if not at max.
|
|
||||||
// if workerCount < p.maxWorkers {
|
|
||||||
// workerCount++
|
|
||||||
// go func(t func()) {
|
|
||||||
// startWorker(startReady, p.readyWorkers)
|
|
||||||
// // Submit the task when the new worker.
|
|
||||||
// taskChan := <-startReady
|
|
||||||
// taskChan <- t
|
|
||||||
// }(task)
|
|
||||||
// } else {
|
|
||||||
// // Start a goroutine to submit the task when an existing
|
|
||||||
// // worker is ready.
|
|
||||||
// go func(t func()) {
|
|
||||||
// taskChan := <-p.readyWorkers
|
|
||||||
// taskChan <- t
|
|
||||||
// }(task)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// case <-timeout.C:
|
|
||||||
// // Timed out waiting for work to arrive. Kill a ready worker.
|
|
||||||
// if workerCount > 0 {
|
|
||||||
// select {
|
|
||||||
// case workerTaskChan = <-p.readyWorkers:
|
|
||||||
// // A worker is ready, so kill.
|
|
||||||
// close(workerTaskChan)
|
|
||||||
// workerCount--
|
|
||||||
// default:
|
|
||||||
// // No work, but no ready workers. All workers are busy.
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // Stop all remaining workers as they become ready.
|
|
||||||
// for workerCount > 0 {
|
|
||||||
// workerTaskChan = <-p.readyWorkers
|
|
||||||
// close(workerTaskChan)
|
|
||||||
// workerCount--
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// func startWorker(startReady, readyWorkers chan chan func()) {
|
|
||||||
// go func() {
|
|
||||||
// taskChan := make(chan func())
|
|
||||||
// var task func()
|
|
||||||
// var ok bool
|
|
||||||
// // Register availability on starReady channel.
|
|
||||||
// startReady <- taskChan
|
|
||||||
// for {
|
|
||||||
// // Read task from dispatcher.
|
|
||||||
// task, ok = <-taskChan
|
|
||||||
// if !ok {
|
|
||||||
// // Dispatcher has told worker to stop.
|
|
||||||
// break
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // Execute the task.
|
|
||||||
// task()
|
|
||||||
|
|
||||||
// // Register availability on readyWorkers channel.
|
|
||||||
// readyWorkers <- taskChan
|
|
||||||
// }
|
|
||||||
// }()
|
|
||||||
// }
|
|
||||||
Reference in new issue
Block a user