collector

This commit is contained in:
insanity@loafle.com 2017-04-28 13:16:08 +09:00
parent 0876129a3a
commit 5f854d9d29
4 changed files with 123 additions and 199 deletions

View File

@ -1,183 +1,99 @@
package collector_go package collector_go
import ( import (
"context" confMng "loafle.com/overflow/agent_api/config_manager"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
s "loafle.com/overflow/collector_go/scheduler" s "loafle.com/overflow/collector_go/scheduler"
conf "loafle.com/overflow/crawler_go/config"
g "loafle.com/overflow/crawler_go/grpc"
crm "loafle.com/overflow/crawler_manager_go"
"log" "log"
"os" "sync"
"path/filepath"
"strings"
"time" "time"
) )
const CONFIG_ROOT = "/config/container" var (
instance *Collector
once sync.Once
)
type Collector struct { func init() {
scheduler s.Scheduler AddObservers()
//configs []*conf.Config
configs map[string]*conf.Config
} }
func (c *Collector) Start() { func GetInstance() *Collector {
once.Do(func() {
instance = &Collector{}
})
return instance
}
func AddObservers() {
go handleConfigLoaded()
}
type Collector struct {
scheduler s.Scheduler
cm confMng.ConfigManager
addSensorCh chan interface{}
remSensorCh chan interface{}
}
func (c *Collector) start(conf confMng.ConfigManager) {
go func() { go func() {
c.configs = make(map[string]*conf.Config, 0) c.cm = conf
if err := c.readAllConfig(); err != nil {
log.Println(err)
}
c.scheduler = s.Scheduler{} c.scheduler = s.Scheduler{}
c.scheduler.Init() c.scheduler.Init()
c.addSensorCh = make(chan interface{})
c.remSensorCh = make(chan interface{})
handleSensorAdded(c.addSensorCh)
handleSensorRemoved(c.remSensorCh)
for _, conf := range c.configs { for _, conf := range c.cm.GetSensors() {
if err := c.addSensor(conf); err != nil { if err := c.addSensor(conf.Id); err != nil {
log.Println(err) log.Println(err)
} }
} }
}() }()
} }
func (c *Collector) collect(id string) {
conf := c.configs[id]
log.Printf("COLLECT %s - [ID: %s] [Crawler : %s]", time.Now(), conf.Id, conf.Crawler.Name)
conn, err := crm.GetInstance().GetClient(conf.Crawler.Container)
if err != nil {
log.Println(err)
}
defer conn.Close()
dc := g.NewDataClient(conn)
in := &g.Input{}
in.Id = id
in.Name = g.Crawlers(g.Crawlers_value[conf.Crawler.Name])
out, err := dc.Get(context.Background(), in)
if err != nil {
log.Println(err)
}
log.Println(out)
}
//func (c *Collector) AddSensor(path string) {
// config := c.readConfig(CONFIG_ROOT + path)
// if config != nil {
// if err := c.addSensor(config); err != nil {
// log.Println(err)
// }
// }
//}
func (c *Collector) AddSensor(conf *conf.Config) {
if c.checkExist(conf.Id) {
log.Println("The Same Id already exists.")
return
}
c.configs[conf.Id] = conf
if conf != nil {
if err := c.addSensor(conf); err != nil {
log.Println(err)
}
}
}
func (c *Collector) RemoveSensor(id string) {
if err := c.scheduler.RemoveSchedule(id); err != nil {
log.Println(err)
}
}
func (c *Collector) UpdateSensor(newConf *conf.Config) {
if newConf != nil {
if !c.checkExist(newConf.Id) {
log.Println("Cannot update Sensor : ID not exist [" + newConf.Id + "]")
return
}
exConf := c.configs[newConf.Id]
if exConf.Schedule.Interval != newConf.Schedule.Interval {
c.scheduler.UpdateSchedule(newConf.Id, newConf.Schedule.Interval)
}
c.configs[newConf.Id] = newConf
}
}
func (c *Collector) Stop() { func (c *Collector) Stop() {
cleanObserver(c.addSensorCh, c.remSensorCh)
c.scheduler.RemoveAllSchedule() c.scheduler.RemoveAllSchedule()
c.scheduler.Stop() c.scheduler.Stop()
} }
func (c *Collector) addSensor(conf *conf.Config) error { func (c *Collector) collect(id string) {
return c.scheduler.NewSchedule(conf.Id, conf.Schedule.Interval, c.collect)
}
func (c *Collector) readAllConfig() error { conf := c.cm.GetSensorById(id)
log.Printf("COLLECT %s - [ID: %s] [Crawler : %s]", time.Now(), conf.Id, conf.Crawler.Name)
err := filepath.Walk(CONFIG_ROOT, func(path string, f os.FileInfo, err error) error { /*
conn, err := crm.GetInstance().GetClient(conf.Crawler.Container)
if err != nil { if err != nil {
return err log.Println(err)
} }
if !f.IsDir() && strings.HasSuffix(f.Name(), ".conf") { defer conn.Close()
c.readConfig(path)
dc := g.NewDataClient(conn)
in := &g.Input{}
in.Id = id
in.Name = g.Crawlers(g.Crawlers_value[conf.Crawler.Name])
out, err := dc.Get(context.Background(), in)
if err != nil {
log.Println(err)
} }
return nil log.Println(out)
}) */
if err != nil {
return err
}
if len(c.configs) <= 0 {
return errors.New("No configuration file found.")
}
return nil
} }
func (c *Collector) readConfig(path string) *conf.Config { func (c *Collector) addSensor(sensorId string) error {
bytes, err := ioutil.ReadFile(path) sensor := c.cm.GetSensorById(sensorId)
if err != nil { return c.scheduler.NewSchedule(sensorId, sensor.Schedule.Interval, c.collect)
fmt.Println(err)
return nil
}
conf := conf.Config{}
json.Unmarshal(bytes, &conf)
if err := c.validateConfig(&conf, path); err != nil {
fmt.Println(err)
return nil
}
c.configs[conf.Id] = &conf
return &conf
} }
func (c *Collector) validateConfig(conf *conf.Config, configPath string) error { func (c *Collector) removeSensor(id string) {
if err := c.scheduler.RemoveSchedule(id); err != nil {
//todo : some validations log.Println(err)
if c.checkExist(conf.Id) { return
return errors.New("The Same Id already exists. " + configPath)
} }
return nil
}
func (c *Collector) checkExist(id string) bool {
if _, exists := c.configs[id]; exists {
return true
}
return false
} }

47
collector_event.go Normal file
View File

@ -0,0 +1,47 @@
package collector_go
import (
"loafle.com/overflow/agent_api/config_manager"
"loafle.com/overflow/agent_api/observer"
"loafle.com/overflow/agent_api/observer/messages"
)
func handleConfigLoaded() {
ch := make(chan interface{}, 0)
observer.Add(messages.CONFIGMANAGER_LOADED, ch)
data := <-ch
confMng := data.(config_manager.ConfigManager)
coll := GetInstance()
coll.start(confMng)
observer.Remove(messages.CONFIGMANAGER_LOADED, ch)
}
func handleSensorAdded(ch chan interface{}) {
coll := GetInstance()
observer.Add(messages.ADD_SENSOR_2_END, ch)
for {
configId := <-ch
coll.addSensor(configId.(string))
}
}
func handleSensorRemoved(ch chan interface{}) {
coll := GetInstance()
observer.Add(messages.REMOVE_SENSOR_1, ch)
for {
configId := <-ch
coll.removeSensor(configId.(string))
observer.Notify(messages.REMOVE_SENSOR_2_END, configId)
}
}
func cleanObserver(ach chan interface{}, rch chan interface{}) {
observer.Remove(messages.ADD_SENSOR_2_END, ach)
observer.Remove(messages.REMOVE_SENSOR_1, rch)
observer.Notify(messages.COLLECTOR_STOPPED, true)
}

View File

@ -1,58 +1,28 @@
package collector_go package collector_go
import ( import (
"encoding/json" s "loafle.com/overflow/collector_go/scheduler"
"fmt"
"io/ioutil"
conf "loafle.com/overflow/crawler_go/config"
"loafle.com/overflow/cron_go"
"log" "log"
"testing" "testing"
"time" "time"
) )
func TestCallGet(t *testing.T) { func TestCollector(t *testing.T) {
c := Collector{} sc := s.Scheduler{}
c.Start() sc.Init()
time.Sleep(time.Second * 10)
//log.Println("add sensor") for i := 0; i < 9999; i++ {
//c.AddSensor("/network/smb/t2.conf") sc.NewSchedule(string(i), "5", test)
//time.Sleep(time.Second * 3)
log.Println("update sensor")
c.UpdateSensor(newConf())
time.Sleep(time.Second * 30)
}
func newConf() *conf.Config {
bytes, err := ioutil.ReadFile("/config/container/network/smb/smb2.conf")
if err != nil {
fmt.Println(err)
return nil
} }
conf := conf.Config{} sc.NewSchedule("#######################", "5", test)
json.Unmarshal(bytes, &conf)
return &conf
}
func TestPooling(t *testing.T) {
c := &cron.Cron{}
c.Start()
c.AddTask("polling", 3).Invoke(handlePolling)
time.Sleep(time.Second * 10)
fmt.Println("UPDATE")
c.UpdateTask("polling", 1)
time.Sleep(time.Second * 10) time.Sleep(time.Second * 10)
fmt.Println("UPDATE") sc.NewSchedule("#######################", "1", test)
c.UpdateTask("polling", 3) time.Sleep(time.Second * 100)
time.Sleep(time.Second * 10)
} }
func handlePolling() { func test(id string) {
fmt.Println(time.Now(), " polling") if id == "#######################" {
log.Println(id)
}
} }

View File

@ -3,7 +3,6 @@ package scheduler
import ( import (
c "loafle.com/overflow/crawler_go" c "loafle.com/overflow/crawler_go"
"loafle.com/overflow/cron_go" "loafle.com/overflow/cron_go"
"log"
"strconv" "strconv"
"sync" "sync"
) )
@ -28,6 +27,7 @@ func (s *Scheduler) Stop() {
} }
func (s *Scheduler) NewSchedule(id, interval string, fn interface{}) error { func (s *Scheduler) NewSchedule(id, interval string, fn interface{}) error {
return s.newSchedule(id, interval, fn) return s.newSchedule(id, interval, fn)
} }
@ -54,12 +54,3 @@ func (s *Scheduler) newSchedule(id string, interval string, fn interface{}) erro
} }
return cron.AddTask(id, uint64(i)).Invoke(fn, id) return cron.AddTask(id, uint64(i)).Invoke(fn, id)
} }
func (s *Scheduler) requestGet(id string) {
data, err := s.crawler.Get(id)
if err != nil {
log.Printf("[ID: %s] An error has occurred. %s", id, err.Error())
return
}
log.Println(data)
}