remove invalid map

envconf.go

@@ -259,7 +259,7 @@ func (c *Config) Status() (ok bool) {
 }
 
 func cleanKey(key string) string {
-	expr := regexp.MustCompile("(?:^_+)|(?:_+(?=_))|(?:_$)")
+	expr := regexp.MustCompile("__+")
 	fn := func(r rune) rune {
 		if (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || r == '_' {
 			return r
@@ -267,8 +267,8 @@ func cleanKey(key string) string {
 		return -1
 	}
 
-	key = strings.Map(fn, strings.ToUpper(key))
-	return expr.ReplaceAllString(key, "")
+	key = strings.Trim(strings.Map(fn, strings.ToUpper(key)), "_")
+	return expr.ReplaceAllString(key, "_")
 }
 
 func keySplit(key string) (left string, right string, ok bool) {
@@ -302,7 +302,7 @@ func (c *Config) getRawMap(key string, dtype DataType) (empty map[string]cValue)
 
 		if ok {
 			for k, v := range entries {
-				if v.dtype == dtype {
+				if (v.dtype == dtype) && (v.parsed.err == nil) {
 					retval[k] = v.parsed
 				} else {
 					return