overflow_cloud/probe
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
geek 2018-07-03 13:28:36 +09:00
parent 3efb90627d
commit 5d2503a224
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
service/SensorConfigService.go
View File

@ -87,7 +87,7 @@ func (s *SensorConfigService) SendInitConfig(containerType occp.ContainerType) e
func (s *SensorConfigService) AddConfig(tempFilePath string) error { func (s *SensorConfigService) AddConfig(tempFilePath string) error {
//sc, buf, err := s.loadConfigFile(tempFilePath) //sc, buf, err := s.loadConfigFile(tempFilePath)
sc, _, err := s.loadConfigFile1(tempFilePath) sc, _, err := s.loadConfigFile([]byte(tempFilePath))
if nil != err { if nil != err {
return err return err
} }
@ -99,25 +99,20 @@ func (s *SensorConfigService) AddConfig(tempFilePath string) error {
fmt.Println(err.Error()) fmt.Println(err.Error())
} }
fmt.Println(sc.SensorID) s.sensorConfigs[sc.SensorID.String()] = sc
// tempfile remove s.sortSensorConfigPerContainer()
//err = os.Remove(tempFilePath)
//if nil != err {
// return err
//}
//s.sensorConfigs[sc.ID.String()] = sc if err := s.ContainerService.Send(occp.ToContainerType(sc.Crawler.MetaCrawlerContainerKey), "SensorConfigService.AddConfig", sc); nil != err {
//s.sortSensorConfigPerContainer() return err
// }
//if err := s.ContainerService.Send(occp.ToContainerType(sc.Crawler.Container), "SensorConfigService.AddConfig", sc); nil != err {
// return err
//}
return nil return nil
} }
func (s *SensorConfigService) UpdateConfig(tempFilePath string) error { func (s *SensorConfigService) UpdateConfig(tempFilePath string) error {
sc, buf, err := s.loadConfigFile(tempFilePath) loadByte, err := ioutil.ReadFile(tempFilePath)
sc, buf, err := s.loadConfigFile(loadByte)
if nil != err { if nil != err {
return err return err
} }
@ -196,7 +191,8 @@ func (s *SensorConfigService) loadConfigDir(dirPath string) error {
return err return err
} }
} else { } else {
sc, _, err := s.loadConfigFile(filePath) buf, err := ioutil.ReadFile(filePath)
sc, _, err := s.loadConfigFile(buf)
if nil != err { if nil != err {
return err return err
} }
@ -207,7 +203,7 @@ func (s *SensorConfigService) loadConfigDir(dirPath string) error {
return nil return nil
} }
func (s *SensorConfigService) loadConfigFile(filePath string) (*ocmsc.SensorConfig, []byte, error) { func (s *SensorConfigService) loadConfigFile1(filePath string) (*ocmsc.SensorConfig, []byte, error) {
logging.Logger().Debugf("filePath: %s", filePath) logging.Logger().Debugf("filePath: %s", filePath)
buf, err := ioutil.ReadFile(filePath) buf, err := ioutil.ReadFile(filePath)
@ -226,9 +222,9 @@ func (s *SensorConfigService) loadConfigFile(filePath string) (*ocmsc.SensorConf
return m, buf, nil return m, buf, nil
} }
func (s *SensorConfigService) loadConfigFile1(decodeStr string) (*ocmsc.SensorConfig, []byte, error) { func (s *SensorConfigService) loadConfigFile(configStrByte []byte) (*ocmsc.SensorConfig, []byte, error) {
//keyStr := s.ProbeClientService.EncryptionKey //keyStr := s.ProbeClientService.EncryptionKey
configStrByte := []byte(decodeStr) //configStrByte := []byte(decodeStr)
keyStr := "aaaaaaaa" keyStr := "aaaaaaaa"
key := []byte(keyStr) key := []byte(keyStr)
@ -239,10 +235,10 @@ func (s *SensorConfigService) loadConfigFile1(decodeStr string) (*ocmsc.SensorCo
return nil, nil, err return nil, nil, err
} }
out := make([]byte, len(decodeStr)) out := make([]byte, len(configStrByte))
dst := out dst := out
bs := block.BlockSize() bs := block.BlockSize()
if len(decodeStr)%bs != 0 { if len(configStrByte)%bs != 0 {
return nil, nil, errors.New("crypto/cipher: input not full blocks") return nil, nil, errors.New("crypto/cipher: input not full blocks")
} }
@ -260,21 +256,16 @@ func (s *SensorConfigService) loadConfigFile1(decodeStr string) (*ocmsc.SensorCo
fmt.Println(err.Error()) fmt.Println(err.Error())
} }
//if b, err := ioutil.ReadAll(gr); err == nil {
// fmt.Println(string(b))
//}
defer gr.Close() defer gr.Close()
data, err := ioutil.ReadAll(gr) data, err := ioutil.ReadAll(gr)
fmt.Println(string(data)) //fmt.Println(string(data))
var m = &ocmsc.SensorConfig{} var m = &ocmsc.SensorConfig{}
if err := json.Unmarshal(data, m); nil != err { if err := json.Unmarshal(data, m); nil != err {
fmt.Println(err.Error()) fmt.Println(err.Error())
return nil, nil, err return nil, nil, err
} }
//fmt.Println(string(data))
return m, data, nil return m, data, nil
} }

1
service/SensorService_test.go
View File

@ -9,6 +9,7 @@ func TestSensorService_AddSensor(t *testing.T) {
config := "pT1QAThXECRfY+Vqe0PpaDrI5TlJ+Psf0AyM5JWiHlHHEr0oZsq8z5L01BnXV4LDHtMXGB0wDb2+L+4SDxk/zM57b7dGHt76ibmZ/R6jPXF8EZYgORbNcyy+m60sesk8fK23unH4Wc1Gqf5ekxTyYjupQ6ZSQbmdFk/WJM3iYy20G8JN3gsHHZtWVCDRVzhQU8sAg+UQ4voSlN3hWajAN8sZFL0HDSba7CjDX3rp9Z7K7VoZCkBsti9b7Z/WhFjHV23zoO786ZhKc8M8lYa69eCgcDDX4zYGJ5RUHnzLFwYkZ6GAoVX0NM8nCA8+yk59CbEcWS1qjR9Xv2C32PuZq8oWOhVW1xiXQDBD1hhAv+3c+m4gZmpHZQ==" config := "pT1QAThXECRfY+Vqe0PpaDrI5TlJ+Psf0AyM5JWiHlHHEr0oZsq8z5L01BnXV4LDHtMXGB0wDb2+L+4SDxk/zM57b7dGHt76ibmZ/R6jPXF8EZYgORbNcyy+m60sesk8fK23unH4Wc1Gqf5ekxTyYjupQ6ZSQbmdFk/WJM3iYy20G8JN3gsHHZtWVCDRVzhQU8sAg+UQ4voSlN3hWajAN8sZFL0HDSba7CjDX3rp9Z7K7VoZCkBsti9b7Z/WhFjHV23zoO786ZhKc8M8lYa69eCgcDDX4zYGJ5RUHnzLFwYkZ6GAoVX0NM8nCA8+yk59CbEcWS1qjR9Xv2C32PuZq8oWOhVW1xiXQDBD1hhAv+3c+m4gZmpHZQ=="
s := &SensorService{} s := &SensorService{}
s.InitService()
err := s.AddSensor(config) err := s.AddSensor(config)
if nil != err { if nil != err {