feat(): update checks starting to work

This commit is contained in:
Torkel Ödegaard
2016-04-11 12:47:04 -04:00
parent b4a8c227cc
commit 6ac3bd4c7c
4 changed files with 15 additions and 7 deletions

View File

@ -15,6 +15,9 @@ type PluginSetting struct {
Dependencies *plugins.PluginDependencies `json:"dependencies"`
JsonData map[string]interface{} `json:"jsonData"`
DefaultNavUrl string `json:"defaultNavUrl"`
LatestVersion string `json:"latestVersion"`
HasUpdate bool `json:"hasUpdate"`
}
type PluginListItem struct {
@ -24,7 +27,7 @@ type PluginListItem struct {
Enabled bool `json:"enabled"`
Pinned bool `json:"pinned"`
Info *plugins.PluginInfo `json:"info"`
LastesVersion string `json:"latestVersion"`
LatestVersion string `json:"latestVersion"`
HasUpdate bool `json:"hasUpdate"`
}

View File

@ -38,6 +38,8 @@ func GetPluginList(c *middleware.Context) Response {
Name: pluginDef.Name,
Type: pluginDef.Type,
Info: &pluginDef.Info,
LatestVersion: pluginDef.GrafanaNetVersion,
HasUpdate: pluginDef.GrafanaNetHasUpdate,
}
if pluginSetting, exists := pluginSettingsMap[pluginDef.Id]; exists {
@ -81,6 +83,8 @@ func GetPluginSettingById(c *middleware.Context) Response {
BaseUrl: def.BaseUrl,
Module: def.Module,
DefaultNavUrl: def.DefaultNavUrl,
LatestVersion: def.GrafanaNetVersion,
HasUpdate: def.GrafanaNetHasUpdate,
}
query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId}

View File

@ -73,7 +73,7 @@ func Init() error {
app.initApp()
}
StartPluginUpdateChecker()
go StartPluginUpdateChecker()
return nil
}

View File

@ -47,7 +47,7 @@ func checkForUpdates() {
log.Trace("Checking for updates")
client := http.Client{Timeout: time.Duration(5 * time.Second)}
resp, err := client.Get("https://grafana.net/api/plugins/repo?grafanaVersion=" + setting.BuildVersion)
resp, err := client.Get("https://grafana.net/api/plugins/repo")
if err != nil {
log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error())
@ -69,6 +69,7 @@ func checkForUpdates() {
return
}
log.Info("GNET PLUG: %v", len(data.Plugins))
for _, plug := range Plugins {
for _, gplug := range data.Plugins {
if gplug.Id == plug.Id {