From df7e15c2921e003c8d440471a250f2da8f2bb99f Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Tue, 27 Jun 2017 12:37:40 +0900 Subject: [PATCH 1/3] sensor start/stop --- proxy/sensor/sensor_service.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/proxy/sensor/sensor_service.go b/proxy/sensor/sensor_service.go index f2bdd81..26b3c16 100644 --- a/proxy/sensor/sensor_service.go +++ b/proxy/sensor/sensor_service.go @@ -64,3 +64,21 @@ func (ss *SensorService) Remove(s *Sensor) (string, error) { return out, nil } + +func (ss *SensorService) Start(s *Sensor) (string, error) { + s.MetaSensorStatus = meta.NewMetaSensorStatus(meta.SENSOR_STATUS_RUNNING) + res, err := ss.Regist(s) + if err != nil { + return "", err + } + return res, nil +} + +func (ss *SensorService) Stop(s *Sensor) (string, error) { + s.MetaSensorStatus = meta.NewMetaSensorStatus(meta.SENSOR_STATUS_STOPPED) + res, err := ss.Regist(s) + if err != nil { + return "", err + } + return res, nil +} \ No newline at end of file From 8e37d047aaec489992e8effb41f26207621dc026 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Tue, 27 Jun 2017 12:37:58 +0900 Subject: [PATCH 2/3] sensor start/stop --- proxy/sensor/sensor_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/sensor/sensor_service.go b/proxy/sensor/sensor_service.go index 26b3c16..2843e66 100644 --- a/proxy/sensor/sensor_service.go +++ b/proxy/sensor/sensor_service.go @@ -81,4 +81,4 @@ func (ss *SensorService) Stop(s *Sensor) (string, error) { return "", err } return res, nil -} \ No newline at end of file +} From 5d1843dc6251227f7e4e6caa4d5ee7140429ef6d Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Tue, 27 Jun 2017 14:40:18 +0900 Subject: [PATCH 3/3] sensor start/stop --- gateway/services.go | 14 ----- proxy/crawler/crawler_service.go | 59 ------------------- proxy/crawler/crawler_service_test.go | 15 ----- .../crawlerinputitem_service.go | 38 ------------ .../crawlerinputitem_service_test.go | 1 - .../crawlerinputitemmapping_service.go | 55 ----------------- .../crawlerinputitemmapping_service_test.go | 25 -------- 7 files changed, 207 deletions(-) delete mode 100644 proxy/crawler/crawler_service.go delete mode 100644 proxy/crawler/crawler_service_test.go delete mode 100644 proxy/crawlerInputItem/crawlerinputitem_service.go delete mode 100644 proxy/crawlerInputItem/crawlerinputitem_service_test.go delete mode 100644 proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go delete mode 100644 proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go diff --git a/gateway/services.go b/gateway/services.go index 9387c9e..4fce767 100644 --- a/gateway/services.go +++ b/gateway/services.go @@ -9,16 +9,10 @@ import ( "log" "reflect" - "git.loafle.net/overflow/overflow_service/proxy/crawler" - "git.loafle.net/overflow/overflow_service/proxy/crawlerInputItem" - "git.loafle.net/overflow/overflow_service/proxy/crawlerinputitemmapping" "git.loafle.net/overflow/overflow_service/proxy/member" "git.loafle.net/overflow/overflow_service/proxy/noauthprobe" "git.loafle.net/overflow/overflow_service/proxy/probe" "git.loafle.net/overflow/overflow_service/proxy/sensor" - "git.loafle.net/overflow/overflow_service/proxy/sensorItem" - "git.loafle.net/overflow/overflow_service/proxy/sensorItemCategory" - "git.loafle.net/overflow/overflow_service/proxy/sensorItemMapping" "git.loafle.net/overflow/overflow_service/proxy/target" //"google.golang.org/grpc/metadata" ) @@ -41,19 +35,11 @@ func InitServices() { g_services = make(map[string]interface{}, 0) // proxy services save - //AddServices("Probe", probe.NewProbeService()) AddServices("Member", member.NewMemberService()) AddServices("NoAuthProbe", noauthprobe.NewNoAuthProbeService()) AddServices("Probe", probe.NewProbeService()) AddServices("Target", target.NewTargetService()) - AddServices("Crawler", crawler.NewCrawlerService()) - AddServices("CrawlerInputItem", crawlerInputItem.NewCrawlerInputItemService()) - AddServices("CrawlerInputItemMapping", crawlerinputitemmapping.NewCrawlerInputItemMappingService()) AddServices("Sensor", sensor.NewSensorService()) - AddServices("SensorItem", sensorItem.NewSensorItemService()) - AddServices("SensorItemCategory", sensorItemCategory.NewSensorItemCategoryService()) - AddServices("SensorItemMapping", sensorItemMapping.NewSensorItemMappingService()) - } type ServiceImpl struct { diff --git a/proxy/crawler/crawler_service.go b/proxy/crawler/crawler_service.go deleted file mode 100644 index 8113e01..0000000 --- a/proxy/crawler/crawler_service.go +++ /dev/null @@ -1,59 +0,0 @@ -package crawler - -// -//import ( -// "encoding/json" -// "git.loafle.net/overflow/commons_go/model/timestamp" -// //"git.loafle.net/overflow/overflow_service/proxy" -// "git.loafle.net/overflow/overflow_service/proxy/utils" -//) -// -//type CrawlerService struct { -// -//} -// -//func NewCrawlerService() *CrawlerService { -// return &CrawlerService{} -//} -// -// -//type Crawler struct { -// Id json.Number `json:"id,Number,omitempty"` -// Name string `json:"name,omitempty"` -// Description string `json:"description,omitempty"` -// CrawlerType string `json:"crawlerType,omitempty"` -// CreateDate timestamp.Timestamp `json:"createDate,omitempty"` -//} -// -// -// -// -// -//func (c *CrawlerService)List() (string, error) { -// -// -// //out := proxy.InvokeDB("crawler", "findAll", nil) -// -// out, err := utils.InvokeDB("crawler", "findAll", nil) -// -// if err != nil { -// return "", err -// } -// -// return out, nil -//} -// -// -//func (c *CrawlerService)Create(ct * Crawler) (string, error) { -// -// -// -// out, err := utils.InvokeDB("crawler", "create", ct) -// -// if err != nil { -// return "", err -// } -// -// -// return out, nil -//} diff --git a/proxy/crawler/crawler_service_test.go b/proxy/crawler/crawler_service_test.go deleted file mode 100644 index 18867b1..0000000 --- a/proxy/crawler/crawler_service_test.go +++ /dev/null @@ -1,15 +0,0 @@ -package crawler - -// -//import "testing" -// -//func TestList(t *testing.T) { -// -// cs := NewCrawlerService() -// -// out := cs.List() -// -// -// t.Log(out) -// -//} diff --git a/proxy/crawlerInputItem/crawlerinputitem_service.go b/proxy/crawlerInputItem/crawlerinputitem_service.go deleted file mode 100644 index e146224..0000000 --- a/proxy/crawlerInputItem/crawlerinputitem_service.go +++ /dev/null @@ -1,38 +0,0 @@ -package crawlerInputItem - -//import ( -// "git.loafle.net/overflow/commons_go/model/timestamp" -// "encoding/json" -// "git.loafle.net/overflow/overflow_service/proxy/utils" -//) -// -//type CrawlerInputItem struct { -// Id json.Number `json:"id,Number,omitempty"` -// Name string `json:"name,omitempty"` -// Description string `json:"description,omitempty"` -// DataType string `json:"dataType,omitempty"` -// CreateDate timestamp.Timestamp `json:"createDate,omitempty"` -//} -// -//type CrawlerInputItemSerivce struct { -// -//} -// -//func NewCrawlerInputItemService() *CrawlerInputItemSerivce { -// return &CrawlerInputItemSerivce{} -//} -// -// -// -//func (c *CrawlerInputItemSerivce)Create(cii * CrawlerInputItem) (string, error) { -// -// out, err := utils.InvokeDB("crawlerInputItem", "create", cii) -// -// if err != nil { -// return "", err -// } -// -// -// return out, nil; -// -//} diff --git a/proxy/crawlerInputItem/crawlerinputitem_service_test.go b/proxy/crawlerInputItem/crawlerinputitem_service_test.go deleted file mode 100644 index bfe54a7..0000000 --- a/proxy/crawlerInputItem/crawlerinputitem_service_test.go +++ /dev/null @@ -1 +0,0 @@ -package crawlerInputItem diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go deleted file mode 100644 index 6da43d8..0000000 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go +++ /dev/null @@ -1,55 +0,0 @@ -package crawlerinputitemmapping - -//import ( -// "git.loafle.net/overflow/commons_go/model/timestamp" -// "encoding/json" -// "git.loafle.net/overflow/overflow_service/proxy/crawler" -// "git.loafle.net/overflow/overflow_service/proxy/crawlerInputItem" -// "git.loafle.net/overflow/overflow_service/proxy/utils" -//) -// -//type CrawlerInputItemMapping struct { -// Id json.Number `json:"id,Number,omitempty"` -// Crawler crawler.Crawler `json:"crawler,omitempty"` -// CrawlerInputItem crawlerInputItem.CrawlerInputItem `json:"crawlerInputItem,omitempty"` -// -// Priority json.Number `json:"priority,Number,omitempty"` -// RequiredType bool `json:"requiredType,omitempty"` -// CreateDate timestamp.Timestamp `json:"createDate,omitempty"` -//} -// -// -//type CrawlerInputItemMappingService struct { -// -//} -// -//func NewCrawlerInputItemMappingService() *CrawlerInputItemMappingService { -// return &CrawlerInputItemMappingService{} -//} -// -//func (c *CrawlerInputItemMappingService)Create(ciim *CrawlerInputItemMapping) (string, error) { -// -// out, err := utils.InvokeDB("crawlerInputItemMapping", "create", ciim) -// -// if err != nil { -// return "", err -// } -// -// -// return out, nil; -// -//} -// -//func (c *CrawlerInputItemMappingService)List(cr *crawler.Crawler) (string, error) { -// -// -// out, err := utils.InvokeDBByModel("crawlerInputItemMapping", "findByCrawlerId", cr, "com.loafle.overflow.crawler.model.Crawler") -// -// if err != nil { -// return "", err -// } -// -// -// return out, nil; -// -//} diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go deleted file mode 100644 index f2e8c84..0000000 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go +++ /dev/null @@ -1,25 +0,0 @@ -package crawlerinputitemmapping - -//import ( -// "testing" -// -// "git.loafle.net/overflow/overflow_service/proxy/crawler" -//) -// -//func TestListCrawler(t *testing.T) { -// -// -// -// niin := NewCrawlerInputItemMappingService() -// -// -// cc := &crawler.Crawler{} -// -// cc.Id = "1"; -// -// out := niin.List(cc) -// -// -// t.Log(out) -// -//}