From ebb2911277faa5ced7d8081fdcf5129bd1fc6bac Mon Sep 17 00:00:00 2001 From: Jean-Louis Huynen Date: Tue, 28 Jan 2020 15:20:09 +0100 Subject: [PATCH] chg: [sshd] HTML compiler logic --- main.go | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 2d842fa..9ca84b8 100644 --- a/main.go +++ b/main.go @@ -8,6 +8,7 @@ import ( "os/signal" "strconv" "strings" + "sync" "time" "bufio" @@ -33,16 +34,23 @@ type ( httpHost string httpPort string } + comutex struct { + mu sync.Mutex + compiling bool + } ) // Setting up flags var ( - confdir = flag.String("c", "conf.sample", "configuration directory") - all = flag.Bool("a", true, "run all parsers when set. Set by default") - specific = flag.String("o", "", "run only a specific parser [sshd]") - redisD4 redis.Conn - redisParsers *redis.Pool - parsers = [1]string{"sshd"} + confdir = flag.String("c", "conf.sample", "configuration directory") + all = flag.Bool("a", true, "run all parsers when set. Set by default") + specific = flag.String("o", "", "run only a specific parser [sshd]") + redisD4 redis.Conn + redisParsers *redis.Pool + parsers = [1]string{"sshd"} + compilationTrigger = 10 + wg sync.WaitGroup + compiling comutex ) func main() { @@ -135,6 +143,9 @@ func main() { // Create a connection Pool redisParsers = newPool(rp.redisHost+":"+rp.redisPort, rp.redisDBCount) + // Line counter to trigger HTML compilation + nblines := 0 + var torun = []logparser.Parser{} // Init parser depending on the parser flags: if *all { @@ -185,12 +196,32 @@ func main() { log.Fatal(err) } } - + nblines++ + if nblines > compilationTrigger { + nblines = 0 + // Non-blocking + if !compiling.compiling { + go compile() + } + } } + wg.Wait() log.Println("Exit") } +func compile() { + compiling.mu.Lock() + compiling.compiling = true + wg.Add(1) + log.Println("I should probably be writing") + time.Sleep(500 * time.Millisecond) + log.Println("Writing") + compiling.compiling = false + compiling.mu.Unlock() + wg.Done() +} + func newPool(addr string, maxconn int) *redis.Pool { return &redis.Pool{ MaxActive: maxconn,