Optimize mapr parsing and stabilize aggregate shutdown

1 files changed, 2 insertions, 9 deletions

diff --git a/internal/mapr/logformat/generic.go b/internal/mapr/logformat/generic.go
index 1350eff..ecb9e75 100644
--- a/internal/mapr/logformat/generic.go
+++ b/internal/mapr/logformat/generic.go
@@ -15,15 +15,8 @@ func newGenericParser(hostname, timeZoneName string, timeZoneOffset int) (*gener
 }
 
 func (p *genericParser) MakeFields(maprLine string) (map[string]string, error) {
-	fields := make(map[string]string, 3)
-
-	fields["*"] = "*"
-	fields["$hostname"] = p.hostname
-	fields["$server"] = p.hostname
-	fields["$line"] = maprLine
-	fields["$empty"] = ""
-	fields["$timezone"] = p.timeZoneName
-	fields["$timeoffset"] = p.timeZoneOffset
+	fields := make(map[string]string, p.fieldsCapacity)
+	p.addDefaultFields(fields, maprLine)
 
 	return fields, nil
 }