syslog filter could take several filters
This commit is contained in:
parent
04ada45f44
commit
69594c2fe4
4 changed files with 48 additions and 23 deletions
|
|
@ -14,7 +14,7 @@ func declareFlags(o *Config) {
|
|||
flag.StringVar(&o.ARPTablePath, "arp-table-path", "/proc/net/arp", "Path to ARP table file")
|
||||
flag.BoolVar(&o.SyslogEnabled, "syslog-enabled", false, "Enable syslog tailing for iwd messages")
|
||||
flag.StringVar(&o.SyslogPath, "syslog-path", "/var/log/messages", "Path to syslog file")
|
||||
flag.StringVar(&o.SyslogFilter, "syslog-filter", "daemon.info iwd:", "Filter string for syslog lines")
|
||||
flag.Var(&StringArray{&o.SyslogFilter}, "daemon.info iwd:", "Filter string for syslog lines")
|
||||
flag.StringVar(&o.SyslogSource, "syslog-source", "iwd", "Source name for syslog entries in logs")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@ import (
|
|||
)
|
||||
|
||||
type Config struct {
|
||||
Bind string
|
||||
WifiInterface string
|
||||
WifiBackend string
|
||||
UseARPDiscovery bool
|
||||
DHCPLeasesPath string
|
||||
ARPTablePath string
|
||||
SyslogEnabled bool
|
||||
SyslogPath string
|
||||
SyslogFilter string
|
||||
SyslogSource string
|
||||
Bind string
|
||||
WifiInterface string
|
||||
WifiBackend string
|
||||
UseARPDiscovery bool
|
||||
DHCPLeasesPath string
|
||||
ARPTablePath string
|
||||
SyslogEnabled bool
|
||||
SyslogPath string
|
||||
SyslogFilter []string
|
||||
SyslogSource string
|
||||
}
|
||||
|
||||
// ConsolidateConfig fills an Options struct by reading configuration from
|
||||
|
|
@ -35,7 +35,7 @@ func ConsolidateConfig() (opts *Config, err error) {
|
|||
ARPTablePath: "/proc/net/arp",
|
||||
SyslogEnabled: false,
|
||||
SyslogPath: "/var/log/messages",
|
||||
SyslogFilter: "daemon.info iwd:",
|
||||
SyslogFilter: []string{"daemon.info wpa_supplicant:", "daemon.info iwd:", "daemon.info hostapd:"},
|
||||
SyslogSource: "iwd",
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,27 @@
|
|||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
// StringArray is a custom type for handling multiple string values in flags.
|
||||
type StringArray struct {
|
||||
Array *[]string
|
||||
}
|
||||
|
||||
// String returns a string representation of the StringArray.
|
||||
func (i *StringArray) String() string {
|
||||
return fmt.Sprintf("%v", i.Array)
|
||||
}
|
||||
|
||||
// Set appends a new string value to the StringArray.
|
||||
func (i *StringArray) Set(value string) error {
|
||||
*i.Array = append(*i.Array, value)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type URL struct {
|
||||
URL *url.URL
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue