Merge remote-tracking branch 'origin/master'

proxy/meta/meta_sensor_status.go

@@ -6,8 +6,8 @@ import (
 )
 
 const (
-	PROBE_STATUS_RUNNING = 1
-	PROBE_STATUS_STOPPED = 2
+	SENSOR_STATUS_RUNNING = 1
+	SENSOR_STATUS_STOPPED = 2
 )
 
 var metaSensorStatusMap = map[int]string{
@@ -20,14 +20,14 @@ type MetaSensorStatus struct {
 	Name string      `json:"name,omitempty"`
 }
 
-func NewMetaSensorStatus(types int) *MetaProbeStatus {
+func NewMetaSensorStatus(types int) *MetaSensorStatus {
 
 	str := metaSensorStatusMap[types]
 
 	if len(str) <= 0 {
 		return nil
 	}
-	return &MetaProbeStatus{
+	return &MetaSensorStatus{
 		Id:   json.Number(strconv.Itoa(types)),
 		Name: str,
 	}