Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix LocalFileConfigInputDetail Unmarshal bug #142

Merged
merged 1 commit into from
Nov 19, 2021
Merged

fix LocalFileConfigInputDetail Unmarshal bug #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions log_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,32 +273,26 @@ func ConvertToDelimiterConfigInputDetail(detail InputDetailInterface) (*Delimite
// LocalFileConfigInputDetail all file input detail's basic config
type LocalFileConfigInputDetail struct {
CommonConfigInputDetail
LogType string `json:"logType"`
LogPath string `json:"logPath"`
FilePattern string `json:"filePattern"`
TimeFormat string `json:"timeFormat"`
TopicFormat string `json:"topicFormat,omitempty"`
Preserve bool `json:"preserve"`
PreserveDepth int `json:"preserveDepth"`
FileEncoding string `json:"fileEncoding,omitempty"`
DiscardUnmatch bool `json:"discardUnmatch"`
MaxDepth int `json:"maxDepth"`
TailExisted bool `json:"tailExisted"`
DiscardNonUtf8 bool `json:"discardNonUtf8"`
DelaySkipBytes int `json:"delaySkipBytes"`
IsDockerFile bool `json:"dockerFile"`
DockerIncludeLabel map[string]string `json:"dockerIncludeLabel,omitempty"`
DockerExcludeLabel map[string]string `json:"dockerExcludeLabel,omitempty"`
DockerIncludeEnv map[string]string `json:"dockerIncludeEnv,omitempty"`
DockerExcludeEnv map[string]string `json:"dockerExcludeEnv,omitempty"`
PluginDetail string `json:"plugin,omitempty"`
Advanced Advanced `json:"advanced"`
}

type Advanced struct {
ForceMultiConfig bool `json:"force_multiconfig,omitempty"`
BlackList map[string][]string `json:"blacklist,omitempty"`
Others string `json:"other,omitempty"`
LogType string `json:"logType"`
LogPath string `json:"logPath"`
FilePattern string `json:"filePattern"`
TimeFormat string `json:"timeFormat"`
TopicFormat string `json:"topicFormat,omitempty"`
Preserve bool `json:"preserve"`
PreserveDepth int `json:"preserveDepth"`
FileEncoding string `json:"fileEncoding,omitempty"`
DiscardUnmatch bool `json:"discardUnmatch"`
MaxDepth int `json:"maxDepth"`
TailExisted bool `json:"tailExisted"`
DiscardNonUtf8 bool `json:"discardNonUtf8"`
DelaySkipBytes int `json:"delaySkipBytes"`
IsDockerFile bool `json:"dockerFile"`
DockerIncludeLabel map[string]string `json:"dockerIncludeLabel,omitempty"`
DockerExcludeLabel map[string]string `json:"dockerExcludeLabel,omitempty"`
DockerIncludeEnv map[string]string `json:"dockerIncludeEnv,omitempty"`
DockerExcludeEnv map[string]string `json:"dockerExcludeEnv,omitempty"`
PluginDetail map[string]interface{} `json:"plugin,omitempty"`
Advanced map[string]interface{} `json:"advanced,omitempty"`
}

func GetFileConfigInputDetailType(detail InputDetailInterface) (string, bool) {
Expand Down