Merge pull request joewalnes#212 from asergeyev/timetokill

Adding --closems feature discussed in joewalnes#207

config.go

@@ -72,6 +72,7 @@ func parseCommandLine() *Config {
 	sslCert := flag.String("sslcert", "", "Should point to certificate PEM file when --ssl is used")
 	sslKey := flag.String("sslkey", "", "Should point to certificate private key file when --ssl is used")
 	maxForksFlag := flag.Int("maxforks", 0, "Max forks, zero means unlimited")
+	closeMsFlag := flag.Uint("closems", 0, "Time to start sending signals (0 never)")
 	redirPortFlag := flag.Int("redirport", 0, "HTTP port to redirect to canonical --port address")
 
 	// lib config options
@@ -133,6 +134,7 @@ func parseCommandLine() *Config {
 	config.HeadersWs = []string(headersWs)
 	config.HeadersHTTP = []string(headersHttp)
 
+	config.CloseMs = *closeMsFlag
 	config.Binary = *binaryFlag
 	config.ReverseLookup = *reverseLookupFlag
 	config.Ssl = *sslFlag

help.go

@@ -83,6 +83,11 @@ Options:
                                  another process (unlimited when 0 or negative).
                                  Default: 0
 
+  --closems=milliseconds         Specifies additional time process needs to gracefully
+                                 finish before websocketd will send termination signals 
+                                 to it. Default: 0 (signals sent after 100ms, 250ms, 
+                                 and 500ms of waiting)
+
   --header="..."                 Set custom HTTP header to each answer. For
                                  example: --header="Server: someserver/0.0.1"
 

libwebsocketd/config.go

@@ -15,6 +15,7 @@ type Config struct {
 	CommandName    string    // Command to execute.
 	CommandArgs    []string  // Additional args to pass to command.
 	ServerSoftware string    // Value to pass to SERVER_SOFTWARE environment variable (e.g. websocketd/1.2.3).
+	CloseMs        uint      // Milliseconds to start sending signals
 
 	// settings
 	Binary         bool     // Use binary communication (send data in chunks they are read from process)

libwebsocketd/handler.go

@@ -80,6 +80,9 @@ func (wsh *WebsocketdHandler) accept(ws *websocket.Conn, log *LogScope) {
 
 	binary := wsh.server.Config.Binary
 	process := NewProcessEndpoint(launched, binary, log)
+	if cms := wsh.server.Config.CloseMs; cms != 0 {
+		process.closetime += time.Duration(cms) * time.Millisecond
+	}
 	wsEndpoint := NewWebSocketEndpoint(ws, binary, log)
 
 	PipeEndpoints(process, wsEndpoint)

libwebsocketd/process_endpoint.go

@@ -13,10 +13,11 @@ import (
 )
 
 type ProcessEndpoint struct {
-	process *LaunchedProcess
-	output  chan []byte
-	log     *LogScope
-	bin     bool
+	process   *LaunchedProcess
+	closetime time.Duration
+	output    chan []byte
+	log       *LogScope
+	bin       bool
 }
 
 func NewProcessEndpoint(process *LaunchedProcess, bin bool, log *LogScope) *ProcessEndpoint {
@@ -40,7 +41,7 @@ func (pe *ProcessEndpoint) Terminate() {
 	case <-terminated:
 		pe.log.Debug("process", "Process %v terminated after stdin was closed", pe.process.cmd.Process.Pid)
 		return // means process finished
-	case <-time.After(100 * time.Millisecond):
+	case <-time.After(100*time.Millisecond + pe.closetime):
 	}
 
 	err := pe.process.cmd.Process.Signal(syscall.SIGINT)
@@ -53,7 +54,7 @@ func (pe *ProcessEndpoint) Terminate() {
 	case <-terminated:
 		pe.log.Debug("process", "Process %v terminated after SIGINT", pe.process.cmd.Process.Pid)
 		return // means process finished
-	case <-time.After(250 * time.Millisecond):
+	case <-time.After(250*time.Millisecond + pe.closetime):
 	}
 
 	err = pe.process.cmd.Process.Signal(syscall.SIGTERM)
@@ -66,7 +67,7 @@ func (pe *ProcessEndpoint) Terminate() {
 	case <-terminated:
 		pe.log.Debug("process", "Process %v terminated after SIGTERM", pe.process.cmd.Process.Pid)
 		return // means process finished
-	case <-time.After(500 * time.Millisecond):
+	case <-time.After(500*time.Millisecond + pe.closetime):
 	}
 
 	err = pe.process.cmd.Process.Kill()

release/Makefile

@@ -19,7 +19,7 @@ LAST_PATCH_VERSION:=$(shell git ls-remote git@github.com:joewalnes/websocketd.gi
 VERSION_PATCH:=$(if $(LAST_PATCH_VERSION),$(shell expr $(LAST_PATCH_VERSION)),0)
 RELEASE_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
 
-GO_VERSION=1.6
+GO_VERSION=1.6.2
 PLATFORMS=linux_amd64 linux_386 linux_arm linux_arm64 darwin_amd64 freebsd_amd64 freebsd_386 windows_386 windows_amd64 openbsd_386 openbsd_amd64 solaris_amd64