Add end-to-end benchmaking

serv/config.go

@@ -11,7 +11,7 @@ type config struct {
 	Env           string
 	HostPort      string `mapstructure:"host_port"`
 	WebUI         bool   `mapstructure:"web_ui"`
-	DebugLevel    int    `mapstructure:"debug_level"`
+	LogLevel      string `mapstructure:"log_level"`
 	EnableTracing bool   `mapstructure:"enable_tracing"`
 	AuthFailBlock string `mapstructure:"auth_fail_block"`
 	Inflections   map[string]string

serv/core.go

@@ -283,7 +283,7 @@ func (c *coreContext) resolveSQL(qc *qcode.QCode, vars variables) (
 
 	finalSQL := stmt.String()
 
-	if conf.DebugLevel > 0 {
+	if conf.LogLevel == "debug" {
 		os.Stdout.WriteString(finalSQL)
 	}
 

serv/http.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/rs/zerolog/log"
 )
 
 const (
@@ -69,18 +68,25 @@ func apiv1Http(w http.ResponseWriter, r *http.Request) {
 	ctx := &coreContext{Context: r.Context()}
 
 	if authFailBlock == authFailBlockAlways && authCheck(ctx) == false {
-		http.Error(w, "Not authorized", 401)
+		err := "Not authorized"
+		logger.Debug().Msg(err)
+		http.Error(w, err, 401)
 		return
 	}
 
 	b, err := ioutil.ReadAll(io.LimitReader(r.Body, maxReadBytes))
 	defer r.Body.Close()
+
 	if err != nil {
+		logger.Err(err).Msg("failed to read request body")
 		errorResp(w, err)
 		return
 	}
 
-	if err := json.Unmarshal(b, &ctx.req); err != nil {
+	err = json.Unmarshal(b, &ctx.req)
+
+	if err != nil {
+		logger.Err(err).Msg("failed to decode json request body")
 		errorResp(w, err)
 		return
 	}
@@ -128,19 +134,18 @@ func apiv1Http(w http.ResponseWriter, r *http.Request) {
 	err = ctx.handleReq(w, r)
 
 	if err == errUnauthorized {
-		http.Error(w, "Not authorized", 401)
+		err := "Not authorized"
+		logger.Debug().Msg(err)
+		http.Error(w, err, 401)
 	}
 
 	if err != nil {
+		logger.Err(err).Msg("Failed to handle request")
 		errorResp(w, err)
 	}
 }
 
 func errorResp(w http.ResponseWriter, err error) {
-	if conf.DebugLevel > 0 {
-		log.Error().Err(err)
-	}
-
 	w.WriteHeader(http.StatusBadRequest)
 	json.NewEncoder(w).Encode(gqlResp{Error: err.Error()})
 }

serv/serv.go

@@ -40,7 +40,10 @@ var (
 
 func initLog() *zerolog.Logger {
 	logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).
-		With().Caller().Logger()
+		With().
+		Timestamp().
+		Caller().
+		Logger()
 
 	return &logger
 	/*
@@ -69,7 +72,6 @@ func initConf() (*config, error) {
 
 	vi.SetDefault("host_port", "0.0.0.0:8080")
 	vi.SetDefault("web_ui", false)
-	vi.SetDefault("debug_level", 0)
 	vi.SetDefault("enable_tracing", false)
 	vi.SetDefault("auth_fail_block", "always")
 
@@ -184,6 +186,12 @@ func Init() {
 		logger.Fatal().Err(err).Msg("failed to read config")
 	}
 
+	logLevel, err := zerolog.ParseLevel(conf.LogLevel)
+	if err != nil {
+		logger.Error().Err(err).Msg("error setting log_level")
+	}
+	zerolog.SetGlobalLevel(logLevel)
+
 	db, err = initDB(conf)
 	if err != nil {
 		logger.Fatal().Err(err).Msg("failed to connect to database")