makes span use init() to run before server.New (#597)

This commit is contained in:
Reed Allman
2017-12-13 16:31:19 -08:00
committed by GitHub
parent 87f8d2180a
commit fab788b539
2 changed files with 59 additions and 61 deletions

View File

@@ -5,21 +5,12 @@ import (
"os"
"os/signal"
"strconv"
"strings"
"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
)
func init() {
var err error
currDir, err = os.Getwd()
if err != nil {
logrus.WithError(err).Fatalln("")
}
// Replace forward slashes in case this is windows, URL parser errors
currDir = strings.Replace(currDir, "\\", "/", -1)
logLevel, err := logrus.ParseLevel(getEnv(EnvLogLevel, DefaultLogLevel))
if err != nil {
logrus.WithError(err).Fatalln("Invalid log level.")
@@ -30,6 +21,11 @@ func init() {
if logLevel == logrus.DebugLevel {
gin.SetMode(gin.DebugMode)
}
// do this in init so that it's only run once & before server.New() which may
// start things that use spans, which are global.
// TODO there's not a great reason that our fn spans don't work w/ noop spans, should fix this really.
setupTracer(getEnv(EnvZipkinURL, ""))
}
func getEnv(key, fallback string) string {