Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2017-06-27 11:46:57 +09:00
commit 51430e1329

View File

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