IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11205 from matrixik/patch-1

Browse Source 
Fix urls in plugin update_checker logs
This commit is contained in:
Carl Bergquist
2018-03-12 20:40:24 +01:00
committed by GitHub
parent 1a781fcee1 5a368f99ec
commit a9d485c1e8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugins/update_checker.go
View File

@@ -63,7 +63,7 @@ func checkForUpdates() {
resp, err := httpClient.Get("https://grafana.com/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion) resp, err := httpClient.Get("https://grafana.com/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
if err != nil { if err != nil {
log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error()) log.Trace("Failed to get plugins repo from grafana.com, %v", err.Error())
return return
} }
@@ -101,7 +101,7 @@ func checkForUpdates() {
resp2, err := httpClient.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json") resp2, err := httpClient.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json")
if err != nil { if err != nil {
log.Trace("Failed to get latest.json repo from github: %v", err.Error()) log.Trace("Failed to get latest.json repo from github.com: %v", err.Error())
return return
} }
@@ -115,7 +115,7 @@ func checkForUpdates() {
var githubLatest GithubLatest var githubLatest GithubLatest
err = json.Unmarshal(body, &githubLatest) err = json.Unmarshal(body, &githubLatest)
if err != nil { if err != nil {
log.Trace("Failed to unmarshal github latest, reading response from github: %v", err.Error()) log.Trace("Failed to unmarshal github.com latest, reading response from github.com: %v", err.Error())
return return
} }