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

chg: [main] reuse existing tcp connection

pull/15/head
Jean-Louis Huynen 2020-05-26 15:37:33 +02:00
parent d52c02f8de
commit ab248fa3ad
No known key found for this signature in database
GPG Key ID: 64799157F4BD6B93
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
d4-goclient.go
View File

@ -266,7 +266,7 @@ func d4loadConfig(d4 *d4S) bool {
} }
if (*d4).conf.source == "d4server" { if (*d4).conf.source == "d4server" {
// Parse Input Redis Config // Parse Input Redis Config
tmp := config.ReadConfigFile(*confdir, "redis_d4") tmp := string(readConfFile(d4, "redis_d4"))
ss := strings.Split(string(tmp), "/") ss := strings.Split(string(tmp), "/")
if len(ss) <= 1 { if len(ss) <= 1 {
log.Fatal("Missing Database in Redis input config: should be host:port/database_name") log.Fatal("Missing Database in Redis input config: should be host:port/database_name")
@ -414,6 +414,12 @@ func setReaderWriters(d4 *d4S) bool {
} }
isn, dstnet := config.IsNet((*d4).conf.destination) isn, dstnet := config.IsNet((*d4).conf.destination)
if isn { if isn {
// First, we test whether a usable connection already exist
// (case where the reader run out of data)
switch (*d4).dst.w.(type){
case net.Conn:
logger.Println("Reusing previous tcp connection.")
default:
dial := net.Dialer{ dial := net.Dialer{
Timeout: (*d4).ct, Timeout: (*d4).ct,
KeepAlive: (*d4).cka, KeepAlive: (*d4).cka,
@ -442,6 +448,7 @@ func setReaderWriters(d4 *d4S) bool {
} }
(*d4).dst = newD4Writer(conn, (*d4).conf.key) (*d4).dst = newD4Writer(conn, (*d4).conf.key)
} }
}
} else { } else {
switch (*d4).conf.destination { switch (*d4).conf.destination {
case "stdout": case "stdout":
@ -466,7 +473,7 @@ func generateUUIDv4() []byte {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
logger.Println(fmt.Sprintf("UUIDv4: %s\n", uuid)) logger.Println(fmt.Sprintf("UUIDv4: %s", uuid))
return uuid.Bytes() return uuid.Bytes()
} }