rename deadlines to timeouts

Signed-off-by: kim (grufwub) <grufwub@gmail.com>

core/config.go

@@ -30,8 +30,8 @@ func ParseFlagsAndSetup(proto string) {
 	flag.StringVar(&Hostname, hostnameFlagStr, "localhost", hostnameDescStr)
 	port := flag.Uint(portFlagStr, 70, portDescStr)
 	fwdPort := flag.Uint(fwdPortFlagStr, 0, fwdPortDescStr)
-	flag.DurationVar(&connReadDeadline, readDeadlineFlagStr, time.Duration(time.Second*3), readDeadlineDescStr)
-	flag.DurationVar(&connWriteDeadline, writeDeadlineFlagStr, time.Duration(time.Second*5), writeDeadlineDescStr)
+	flag.DurationVar(&connReadDeadline, connReadTimeoutFlagStr, time.Duration(time.Second*3), connReadTimeoutDescStr)
+	flag.DurationVar(&connWriteDeadline, connWriteTimeoutFlagStr, time.Duration(time.Second*5), connWriteTimeoutDescStr)
 	cReadBuf := flag.Uint(connReadBufFlagStr, 1024, connReadBufDescStr)
 	cWriteBuf := flag.Uint(connWriteBufFlagStr, 1024, connWriteBufDescStr)
 	cReadMax := flag.Uint(connReadMaxFlagStr, 4096, connReadMaxDescStr)
@@ -46,8 +46,8 @@ func ParseFlagsAndSetup(proto string) {
 	cgiDir := flag.String(cgiDirFlagStr, "", cgiDirDescStr)
 	scgiPathsList := flag.String(scgiPathsFlagStr, "", scgiPathsDescStr)
 	scgiReadBuf := flag.Uint(scgiReadBufFlagStr, 1024, scgiReadBufDescStr)
-	flag.DurationVar(&scgiReadDeadline, scgiReadDeadlineFlagStr, time.Duration(time.Second*1), scgiReadDeadlineDescStr)
-	flag.DurationVar(&scgiWriteDeadline, scgiWriteDeadlineFlagStr, time.Duration(time.Second*3), scgiWriteDeadlineDescStr)
+	flag.DurationVar(&scgiReadDeadline, scgiReadTimeoutFlagStr, time.Duration(time.Second*1), scgiReadTimeoutDescStr)
+	flag.DurationVar(&scgiWriteDeadline, scgiWriteTimeoutFlagStr, time.Duration(time.Second*3), scgiWriteTimeoutDescStr)
 	flag.DurationVar(&maxCGIRunTime, maxCGITimeFlagStr, time.Duration(time.Second*3), maxCGITimeDescStr)
 	safePath := flag.String(safePathFlagStr, "/bin:/usr/bin", safePathDescStr)
 	flag.StringVar(&userDir, userDirFlagStr, "", userDirDescStr)

core/string_constants.go

@@ -23,11 +23,11 @@ const (
 	fwdPortFlagStr = "fwd-port"
 	fwdPortDescStr = "Outward-facing port"
 
-	readDeadlineFlagStr = "read-deadline"
-	readDeadlineDescStr = "Connection read deadline (timeout)"
+	connReadTimeoutFlagStr = "conn-read-timeout"
+	connReadTimeoutDescStr = "Client connection read timeout"
 
-	writeDeadlineFlagStr = "write-deadline"
-	writeDeadlineDescStr = "Connection write deadline (timeout)"
+	connWriteTimeoutFlagStr = "conn-write-timeout"
+	connWriteTimeoutDescStr = "Client connection write timeout"
 
 	connReadBufFlagStr = "conn-read-buf"
 	connReadBufDescStr = "Connection read buffer size (bytes)"
@@ -68,17 +68,17 @@ const (
 	scgiReadBufFlagStr = "scgi-read-buf"
 	scgiReadBufDescStr = "SCGI connection read buffer size (bytes)"
 
-	scgiReadDeadlineFlagStr = "scgi-read-deadline"
-	scgiReadDeadlineDescStr = "SCGI connection read deadline (timeout)"
+	scgiReadTimeoutFlagStr = "scgi-read-timeout"
+	scgiReadTimeoutDescStr = "SCGI connection read timeout"
 
-	scgiWriteDeadlineFlagStr = "scgi-write-deadline"
-	scgiWriteDeadlineDescStr = "SCGI connection write deadline (timeout)"
+	scgiWriteTimeoutFlagStr = "scgi-write-timeout"
+	scgiWriteTimeoutDescStr = "SCGI connection write timeout"
 
 	cgiDirFlagStr = "cgi-dir"
 	cgiDirDescStr = "CGI scripts directory (empty to disable)"
 
 	maxCGITimeFlagStr = "max-cgi-time"
-	maxCGITimeDescStr = "Max CGI script execution time"
+	maxCGITimeDescStr = "Maximum CGI script execution time"
 
 	safePathFlagStr = "safe-path"
 	safePathDescStr = "CGI environment safe PATH variable"