Merge pull request #15 from D4-project/tcpreuse

Tcpreuse
pull/19/head
Jean-Louis Huynen 2020-05-26 16:18:18 +02:00 committed by GitHub
commit 21256a2ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 27 deletions

View File

@ -200,7 +200,13 @@ func main() {
// copy routine // copy routine
go d4Copy(d4p, c) go d4Copy(d4p, c)
// Block until the rate limiter allow us to continue // Block until the rate limiter allow us to continue
<-ratelimiter select {
case <-ratelimiter:
continue
case <-s:
logger.Println("Exiting")
exit(d4p, 0)
}
} else if d4.retry > 0 { } else if d4.retry > 0 {
go func() { go func() {
logger.Println(fmt.Sprintf("Sleeping for %.f seconds before retry...", d4.retry.Seconds())) logger.Println(fmt.Sprintf("Sleeping for %.f seconds before retry...", d4.retry.Seconds()))
@ -266,7 +272,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 +420,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:
// in this case, it's already set up.
default:
dial := net.Dialer{ dial := net.Dialer{
Timeout: (*d4).ct, Timeout: (*d4).ct,
KeepAlive: (*d4).cka, KeepAlive: (*d4).cka,
@ -442,6 +454,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 +479,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()
} }