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

gofmt

Browse Source
This commit is contained in:
Daniel Low 2015-12-22 13:10:34 +00:00
parent ea566fff24
commit 3f9f0679ec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/sqlstore.go
View File

@ -14,11 +14,11 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/go-sql-driver/mysql"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
_ "github.com/lib/pq" _ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"github.com/go-sql-driver/mysql"
) )
type MySQLConfig struct { type MySQLConfig struct {

4
pkg/services/sqlstore/tls_mysql.go
View File

@ -17,7 +17,7 @@ func makeCert(tlsPoolName string, config MySQLConfig) (*tls.Config, error) {
return nil, err return nil, err
} }
clientCert := make([]tls.Certificate, 0, 1) clientCert := make([]tls.Certificate, 0, 1)
if (config.ClientCertPath != "" && config.ClientKeyPath != "") { if config.ClientCertPath != "" && config.ClientKeyPath != "" {
certs, err := tls.LoadX509KeyPair(config.ClientCertPath, config.ClientKeyPath) certs, err := tls.LoadX509KeyPair(config.ClientCertPath, config.ClientKeyPath)
if err != nil { if err != nil {
@ -34,7 +34,7 @@ func makeCert(tlsPoolName string, config MySQLConfig) (*tls.Config, error) {
tlsConfig.InsecureSkipVerify = true tlsConfig.InsecureSkipVerify = true
} }
// Return more meaningful error before it is too late // Return more meaningful error before it is too late
if config.ServerCertName == "" && !tlsConfig.InsecureSkipVerify{ if config.ServerCertName == "" && !tlsConfig.InsecureSkipVerify {
return nil, fmt.Errorf("server_cert_name is missing. Consider using ssl_mode = skip-verify.") return nil, fmt.Errorf("server_cert_name is missing. Consider using ssl_mode = skip-verify.")
} }
return tlsConfig, nil return tlsConfig, nil