Cleanup bugs from merging master into keystone

Author: Ryan Bak

conf/defaults.ini

@@ -235,7 +235,7 @@ config_file = /etc/grafana/ldap.toml
 enabled = false
 auth_url = http://localhost:5000
 default_domain = default
-#default_role = Viewer
+default_role =
 global_admin_roles =
 admin_roles = admin
 editor_roles = _member_

pkg/api/dataproxy.go

@@ -99,7 +99,7 @@ func ProxyDataSourceRequest(c *middleware.Context) {
 		}
 	}
 
-	keystoneAuth, _ := ds.JsonData["keystoneAuth"].(bool)
+	keystoneAuth := ds.JsonData.Get("keystoneAuth").MustBool()
 	if keystoneAuth {
 		token, err := keystone.GetToken(c)
 		if err != nil {

pkg/api/keystone/keystone_requests.go

@@ -188,20 +188,13 @@ func authenticate(data *Auth_data, b []byte) error {
 		return errors.New("Keystone authentication failed: " + resp.Status)
 	}
 
-	var decoder *json.Decoder
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(resp.Body)
+	strBody := buf.Bytes()
+	log.Debug("Authentication response: \n%s", strBody)
 
-	if log.IsDebug() {
-		buf := new(bytes.Buffer)
-		buf.ReadFrom(resp.Body)
-		strBody := buf.Bytes()
-
-		log.Debug("Authentication response: \n%s", strBody)
-
-		bodyReader := bytes.NewBufferString(fmt.Sprintf("%s", strBody))
-		decoder = json.NewDecoder(bodyReader)
-	} else {
-		decoder = json.NewDecoder(resp.Body)
-	}
+	bodyReader := bytes.NewBufferString(fmt.Sprintf("%s", strBody))
+	var decoder = json.NewDecoder(bodyReader)
 
 	var auth_response auth_response_struct
 	err = decoder.Decode(&auth_response)
@@ -257,20 +250,13 @@ func GetProjects(data *Projects_data) error {
 		return errors.New("Keystone project-list failed: " + resp.Status)
 	}
 
-	var decoder *json.Decoder
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(resp.Body)
+	strBody := buf.Bytes()
+	log.Debug("Projects response: \n%s", strBody)
 
-	if log.IsDebug() {
-		buf := new(bytes.Buffer)
-		buf.ReadFrom(resp.Body)
-		strBody := buf.Bytes()
-
-		log.Debug("Projects response: \n%s", strBody)
-
-		bodyReader := bytes.NewBufferString(fmt.Sprintf("%s", strBody))
-		decoder = json.NewDecoder(bodyReader)
-	} else {
-		decoder = json.NewDecoder(resp.Body)
-	}
+	bodyReader := bytes.NewBufferString(fmt.Sprintf("%s", strBody))
+	var decoder = json.NewDecoder(bodyReader)
 
 	var project_response project_response_struct
 	err = decoder.Decode(&project_response)

pkg/log/log.go

@@ -30,28 +30,10 @@ func New(logger string, ctx ...interface{}) Logger {
 	return Root.New(params...)
 }
 
-func IsTrace() bool {
-	for _, logger := range loggers {
-		if logger.level <= TRACE {
-			return true
-		}
-	}
-	return false
-}
-
 func Trace(format string, v ...interface{}) {
 	Root.Debug(fmt.Sprintf(format, v))
 }
 
-func IsDebug() bool {
-	for _, logger := range loggers {
-		if logger.level <= DEBUG {
-			return true
-		}
-	}
-	return false
-}
-
 func Debug(format string, v ...interface{}) {
 	Root.Debug(fmt.Sprintf(format, v))
 }
@@ -60,15 +42,6 @@ func Debug2(message string, v ...interface{}) {
 	Root.Debug(message, v...)
 }
 
-func IsInfo() bool {
-	for _, logger := range loggers {
-		if logger.level <= INFO {
-			return true
-		}
-	}
-	return false
-}
-
 func Info(format string, v ...interface{}) {
 	Root.Info(fmt.Sprintf(format, v))
 }
@@ -77,15 +50,6 @@ func Info2(message string, v ...interface{}) {
 	Root.Info(message, v...)
 }
 
-func IsWarn() bool {
-	for _, logger := range loggers {
-		if logger.level <= WARN {
-			return true
-		}
-	}
-	return false
-}
-
 func Warn(format string, v ...interface{}) {
 	Root.Warn(fmt.Sprintf(format, v))
 }
@@ -94,15 +58,6 @@ func Warn2(message string, v ...interface{}) {
 	Root.Warn(message, v...)
 }
 
-func IsError() bool {
-	for _, logger := range loggers {
-		if logger.level <= ERROR {
-			return true
-		}
-	}
-	return false
-}
-
 func Error(skip int, format string, v ...interface{}) {
 	Root.Error(fmt.Sprintf(format, v))
 }
@@ -111,28 +66,10 @@ func Error2(message string, v ...interface{}) {
 	Root.Error(message, v...)
 }
 
-func IsCritical() bool {
-	for _, logger := range loggers {
-		if logger.level <= CRITICAL {
-			return true
-		}
-	}
-	return false
-}
-
 func Critical(skip int, format string, v ...interface{}) {
 	Root.Crit(fmt.Sprintf(format, v))
 }
 
-func IsFatal() bool {
-	for _, logger := range loggers {
-		if logger.level <= FATAL {
-			return true
-		}
-	}
-	return false
-}
-
 func Fatal(skip int, format string, v ...interface{}) {
 	Root.Crit(fmt.Sprintf(format, v))
 	Close()