Fixes issues #3 and #4

ian-kent · Mar 21, 2017 · d5b0f2f · d5b0f2f
1 parent 740905f
commit d5b0f2f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gofigure.go b/gofigure.go
@@ -18,15 +18,16 @@ import (
 
 // Debug controls log output
 var Debug = false
-var _ = func() {
+var _ = func() (_ struct{}) {
 	env := os.Getenv("GOFIGURE_DEBUG")
 	if len(env) > 0 {
 		Debug, _ = strconv.ParseBool(env)
 	}
 
 	sources.Logger = printf
 	sources.Debug = Debug
-}
+	return
+}()
 
 func printf(message string, args ...interface{}) {
 	if !Debug {
@@ -264,10 +265,10 @@ func (gfg *gofiguration) registerFields() error {
 		default:
 			gfg.printf("Registering as default type")
 			for _, o := range gfg.order {
-				gfg.printf("Registering '%s' for source '%s' with key '%s'", gfi.field, o, kn)
 				if k, ok := gfi.keys[o]; ok {
 					kn = k
 				}
+				gfg.printf("Registering '%s' for source '%s' with key '%s'", gfi.field, o, kn)
 				err = Sources[o].Register(kn, "", gfi.keys, gfi.goField.Type)
 			}
 		}