From fd242d6d9dfc5031ac555c235064fa4a8ec42ccd Mon Sep 17 00:00:00 2001 From: Jean-Louis Huynen Date: Wed, 5 Jun 2019 11:22:44 +0200 Subject: [PATCH] fix: [dev] first working version --- balboa.go | 18 ++++++------------ go.mod | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/balboa.go b/balboa.go index 0b7fa56..cc75779 100644 --- a/balboa.go +++ b/balboa.go @@ -84,39 +84,33 @@ func main() { } c.redisQueue = string(config.ReadConfigFile(*confdir, "redis_queue")) c.balboaSocket = string(config.ReadConfigFile(*confdir, "balboa_socket")) - //TODO: handle empty ... initRedis(c.redisHost, c.redisPort, c.redisDB) defer cr.Close() addr, err := net.ResolveUnixAddr("unix", c.balboaSocket) if err != nil { - fmt.Printf("Failed to resolve: %v\n", err) - os.Exit(1) + log.Fatalf("Failed to resolve: %v\n", err) } cs, err := net.DialUnix("unix", nil, addr) if err != nil { - fmt.Printf("Failed to dial: %v\n", err) - os.Exit(1) + log.Fatalf("Failed to dial: %v\n", err) } defer cs.Close() - //defer cs.Close() - if err != nil { - panic(err) - } // pop redis queue for { dnsLine, err := redis.String(cr.Do("LPOP", "analyzer:8:"+c.redisQueue)) + dnsLine = fmt.Sprintf("%s%s", dnsLine, "\n") if err != nil { fmt.Println("Queue processed.") os.Exit(0) } // Write in Balboa socket - if i, err := cs.Write([]byte(dnsLine)); err != nil { - fmt.Printf("DIAL: Error: %v\n", err) + if _, err := cs.Write([]byte(dnsLine)); err != nil { + fmt.Printf("Write Error: %v\n", err) } else { - fmt.Printf("Sent %v bytes\n", i) + fmt.Printf("Write: %v", dnsLine) } // Exit Signal Handle diff --git a/go.mod b/go.mod index e5388c9..c89b5e5 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/D4-project/analyzer-d4-balboa go 1.12 require ( - github.com/D4-project/d4-golang-utils v0.0.0-20190603131519-c10ee092655c // indirect - github.com/gomodule/redigo v2.0.0+incompatible // indirect + github.com/D4-project/d4-golang-utils v0.0.0-20190603131519-c10ee092655c + github.com/gomodule/redigo v2.0.0+incompatible )