v0.28.0 option schema in struct tags, schema replacing plugin factory metadata, tui prep
This commit is contained in:
1 parent
a1648ce17b
commit
e8e5f05e47
43 files changed
+1345
-1211
No files matched your search
@@ -3,21 +3,15 @@ package format
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"sync"
|
||||
|
||||
"github.com/lixenwraith/logwisp/internal/config"
|
||||
"github.com/lixenwraith/logwisp/internal/core"
|
||||
|
||||
lconfig "github.com/lixenwraith/config"
|
||||
"github.com/lixenwraith/log/formatter"
|
||||
"github.com/lixenwraith/log/sanitizer"
|
||||
)
|
||||
|
||||
const (
|
||||
DefaultFormatType = "raw"
|
||||
)
|
||||
|
||||
// FormatterAdapter wraps log/formatter for logwisp compatibility
|
||||
type FormatterAdapter struct {
|
||||
formatter *formatter.Formatter
|
||||
@@ -28,24 +22,8 @@ type FormatterAdapter struct {
|
||||
|
||||
// NewFormatterAdapter creates adapter from config
|
||||
func NewFormatterAdapter(cfg *config.FormatConfig) (*FormatterAdapter, error) {
|
||||
// Validate
|
||||
if cfg.Type != "" {
|
||||
validateType := lconfig.OneOf("json", "txt", "text", "raw")
|
||||
if err := validateType(cfg.Type); err != nil {
|
||||
return nil, fmt.Errorf("type: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if cfg.SanitizerPolicy != "" {
|
||||
validatePolicy := lconfig.OneOf("raw", "json", "txt", "shell")
|
||||
if err := validatePolicy(cfg.SanitizerPolicy); err != nil {
|
||||
return nil, fmt.Errorf("sanitizer_policy: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Defaults
|
||||
if cfg.Type == "" {
|
||||
cfg.Type = DefaultFormatType
|
||||
if err := config.Settle(cfg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Create sanitizer based on policy
|
||||
|
||||
Reference in new issue
Block a user