fix: [dev] first working version

master
Jean-Louis Huynen 2019-06-05 11:22:44 +02:00
parent b50fac4c19
commit fd242d6d9d
No known key found for this signature in database
GPG Key ID: 64799157F4BD6B93
2 changed files with 8 additions and 14 deletions

View File

@ -84,39 +84,33 @@ func main() {
} }
c.redisQueue = string(config.ReadConfigFile(*confdir, "redis_queue")) c.redisQueue = string(config.ReadConfigFile(*confdir, "redis_queue"))
c.balboaSocket = string(config.ReadConfigFile(*confdir, "balboa_socket")) c.balboaSocket = string(config.ReadConfigFile(*confdir, "balboa_socket"))
//TODO: handle empty ...
initRedis(c.redisHost, c.redisPort, c.redisDB) initRedis(c.redisHost, c.redisPort, c.redisDB)
defer cr.Close() defer cr.Close()
addr, err := net.ResolveUnixAddr("unix", c.balboaSocket) addr, err := net.ResolveUnixAddr("unix", c.balboaSocket)
if err != nil { if err != nil {
fmt.Printf("Failed to resolve: %v\n", err) log.Fatalf("Failed to resolve: %v\n", err)
os.Exit(1)
} }
cs, err := net.DialUnix("unix", nil, addr) cs, err := net.DialUnix("unix", nil, addr)
if err != nil { if err != nil {
fmt.Printf("Failed to dial: %v\n", err) log.Fatalf("Failed to dial: %v\n", err)
os.Exit(1)
} }
defer cs.Close() defer cs.Close()
//defer cs.Close()
if err != nil {
panic(err)
}
// pop redis queue // pop redis queue
for { for {
dnsLine, err := redis.String(cr.Do("LPOP", "analyzer:8:"+c.redisQueue)) dnsLine, err := redis.String(cr.Do("LPOP", "analyzer:8:"+c.redisQueue))
dnsLine = fmt.Sprintf("%s%s", dnsLine, "\n")
if err != nil { if err != nil {
fmt.Println("Queue processed.") fmt.Println("Queue processed.")
os.Exit(0) os.Exit(0)
} }
// Write in Balboa socket // Write in Balboa socket
if i, err := cs.Write([]byte(dnsLine)); err != nil { if _, err := cs.Write([]byte(dnsLine)); err != nil {
fmt.Printf("DIAL: Error: %v\n", err) fmt.Printf("Write Error: %v\n", err)
} else { } else {
fmt.Printf("Sent %v bytes\n", i) fmt.Printf("Write: %v", dnsLine)
} }
// Exit Signal Handle // Exit Signal Handle

4
go.mod
View File

@ -3,6 +3,6 @@ module github.com/D4-project/analyzer-d4-balboa
go 1.12 go 1.12
require ( require (
github.com/D4-project/d4-golang-utils v0.0.0-20190603131519-c10ee092655c // indirect github.com/D4-project/d4-golang-utils v0.0.0-20190603131519-c10ee092655c
github.com/gomodule/redigo v2.0.0+incompatible // indirect github.com/gomodule/redigo v2.0.0+incompatible
) )