Improve configuration merge

This commit is contained in:
世界
2023-12-10 22:57:28 +08:00
parent 112104948f
commit e746fcc41b
2 changed files with 10 additions and 2 deletions

View File

@@ -9,6 +9,7 @@ import (
)
type _Options struct {
RawMessage json.RawMessage `json:"-"`
Schema string `json:"$schema,omitempty"`
Log *LogOptions `json:"log,omitempty"`
DNS *DNSOptions `json:"dns,omitempty"`
@@ -34,6 +35,7 @@ func (o *Options) UnmarshalJSON(content []byte) error {
column := len(prefix) - strings.LastIndex(prefix, "\n") - 1
return E.Extend(syntaxError, "row ", row, ", column ", column)
}
o.RawMessage = content
return err
}