D4
/
analyzer-d4-log
mirror of https://github.com/D4-project/analyzer-d4-log
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [main] no parsers anynore

nifi
Jean-Louis Huynen 2020-03-04 15:58:07 +01:00
parent 282704ec2d
commit b3b3649503
No known key found for this signature in database
GPG Key ID: 64799157F4BD6B93
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.go
View File

@ -24,7 +24,7 @@ type (
redisDB int redisDB int
redisQueue string redisQueue string
} }
redisconfParsers struct { redisconfCompilers struct {
redisHost string redisHost string
redisPort string redisPort string
redisDBCount int redisDBCount int
@ -49,8 +49,8 @@ var (
retry = flag.Int("r", 1, "time in minute before retry on empty d4 queue") retry = flag.Int("r", 1, "time in minute before retry on empty d4 queue")
flush = flag.Bool("F", false, "Flush HTML output, recompile all statistic from redis logs, then quits") flush = flag.Bool("F", false, "Flush HTML output, recompile all statistic from redis logs, then quits")
redisD4 redis.Conn redisD4 redis.Conn
redisParsers *redis.Pool redisCompilers *redis.Pool
parsers = [1]string{"sshd"} compilers = [1]string{"sshd"}
compilationTrigger = 20 compilationTrigger = 20
wg sync.WaitGroup wg sync.WaitGroup
compiling comutex compiling comutex
@ -80,8 +80,8 @@ func main() {
// Usage and flags // Usage and flags
flag.Usage = func() { flag.Usage = func() {
fmt.Printf("analyzer-d4-log:\n\n") fmt.Printf("analyzer-d4-log:\n\n")
fmt.Printf(" Generate statistics about logs collected through d4 in\n") fmt.Printf(" Generate statistics about logs collected through d4 in HTML format.\n")
fmt.Printf(" HTML format. Optionally serves the results over HTTP.\n") fmt.Printf(" Logs should be groked and served as escaped JSON.\n")
fmt.Printf("\n") fmt.Printf("\n")
flag.PrintDefaults() flag.PrintDefaults()
fmt.Printf("\n") fmt.Printf("\n")
@ -97,7 +97,7 @@ func main() {
// Config // Config
// c := conf{} // c := conf{}
rd4 := redisconfD4{} rd4 := redisconfD4{}
rp := redisconfParsers{} rp := redisconfCompilers{}
flag.Parse() flag.Parse()
if flag.NFlag() == 0 || *confdir == "" { if flag.NFlag() == 0 || *confdir == "" {
flag.Usage() flag.Usage()
@ -141,8 +141,8 @@ func main() {
defer redisD4.Close() defer redisD4.Close()
} }
// Parse Redis Parsers Config // Parse Redis Compilers Config
tmp := config.ReadConfigFile(*confdir, "redis_parsers") tmp := config.ReadConfigFile(*confdir, "redis_compilers")
ss := strings.Split(string(tmp), "/") ss := strings.Split(string(tmp), "/")
if len(ss) <= 1 { if len(ss) <= 1 {
log.Fatal("Missing Database Count in Redis config: should be host:port/max number of DB") log.Fatal("Missing Database Count in Redis config: should be host:port/max number of DB")
@ -159,7 +159,7 @@ func main() {
} }
// Create a connection Pool // Create a connection Pool
redisParsers = newPool(rp.redisHost+":"+rp.redisPort, rp.redisDBCount) redisCompilers = newPool(rp.redisHost+":"+rp.redisPort, rp.redisDBCount)
// Line counter to trigger HTML compilation // Line counter to trigger HTML compilation
nblines := 0 nblines := 0
@ -167,14 +167,14 @@ func main() {
// Init parser depending on the parser flags: // Init parser depending on the parser flags:
if *all { if *all {
// Init all parsers // Init all parsers
for _, v := range parsers { for _, v := range compilers {
switch v { switch v {
case "sshd": case "sshd":
sshdrcon1, err := redisParsers.Dial() sshdrcon1, err := redisCompilers.Dial()
if err != nil { if err != nil {
log.Fatal("Could not connect to Line one Redis") log.Fatal("Could not connect to Line one Redis")
} }
sshdrcon2, err := redisParsers.Dial() sshdrcon2, err := redisCompilers.Dial()
if err != nil { if err != nil {
log.Fatal("Could not connect to Line two Redis") log.Fatal("Could not connect to Line two Redis")
} }