opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 01:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Avoid aliasing importing models in api package (#22492)

Browse Source
This commit is contained in:
Carl Bergquist
2020-03-04 12:57:20 +01:00
committed by GitHub
parent fcaff011b1
commit 3fdd2648b1
53 changed files with 910 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/live/stream_manager.go
View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
)
type StreamManager struct {
@ -51,11 +51,11 @@ func (sm *StreamManager) Serve(w http.ResponseWriter, r *http.Request) {
c.readPump()
}
func (s *StreamManager) GetStreamList() m.StreamList {
list := make(m.StreamList, 0)
func (s *StreamManager) GetStreamList() models.StreamList {
list := make(models.StreamList, 0)
for _, stream := range s.streams {
list = append(list, &m.StreamInfo{
list = append(list, &models.StreamInfo{
Name: stream.name,
})
}
@ -63,7 +63,7 @@ func (s *StreamManager) GetStreamList() m.StreamList {
return list
}
func (s *StreamManager) Push(packet *m.StreamPacket) {
func (s *StreamManager) Push(packet *models.StreamPacket) {
stream, exist := s.streams[packet.Stream]
if !exist {
@ -87,7 +87,7 @@ func NewStream(name string) *Stream {
}
}
func (s *Stream) Push(packet *m.StreamPacket) {
func (s *Stream) Push(packet *models.StreamPacket) {
messageBytes, _ := simplejson.NewFromAny(packet).Encode()