public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13031 from bergquist/golang_1.11

Browse Source 
upgrade to golang 1.11
This commit is contained in:
Leonard Gram
2018-09-05 15:31:43 +02:00
committed by GitHub
parent 25f13bd3ad eed141fb54
commit 5d87aa2fa4
19 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/notifiers/telegram.go
+1 -1
View File
@@ -216,7 +216,7 @@ func appendIfPossible(message string, extra string, sizeLimit int) string {
if len(extra)+len(message) <= sizeLimit {
return message + extra
}
log.Debug("Line too long for image caption.", "value", extra)
log.Debug("Line too long for image caption. value: %s", extra)
return message
}
pkg/services/sqlstore/sqlstore.go
+1 -1
View File
@@ -106,7 +106,7 @@ func (ss *SqlStore) inTransactionWithRetryCtx(ctx context.Context, callback dbTr
if len(sess.events) > 0 {
for _, e := range sess.events {
if err = bus.Publish(e); err != nil {
log.Error(3, "Failed to publish event after commit", err)
log.Error(3, "Failed to publish event after commit. error: %v", err)
}
}
}
pkg/services/sqlstore/transactions.go
+1 -1
View File
@@ -89,7 +89,7 @@ func inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc,
if len(sess.events) > 0 {
for _, e := range sess.events {
if err = bus.Publish(e); err != nil {
log.Error(3, "Failed to publish event after commit", err)
log.Error(3, "Failed to publish event after commit. error: %v", err)
}
}
}