Rename functions to executor, correct log for duration from int to string

Signed-off-by: Alex Ellis <[email protected]>

Author: alexellis

Dockerfile

@@ -1,10 +1,11 @@
-FROM golang:1.9.1
+FROM golang:1.9.4
+
 RUN mkdir -p /go/src/github.com/openfaas-incubator/of-watchdog
 WORKDIR /go/src/github.com/openfaas-incubator/of-watchdog
 
 COPY main.go    .
 COPY config     config
-COPY functions  functions
+COPY executor   executor
 
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"

functions/afterburn_runner.go renamed to executor/afterburn_runner.go

@@ -1,4 +1,4 @@
-package functions
+package executor
 
 import (
 	"bufio"

functions/http_runner.go renamed to executor/http_runner.go

@@ -1,4 +1,4 @@
-package functions
+package executor
 
 import (
 	"io"

functions/serializing_fork_runner.go renamed to executor/serializing_fork_runner.go

@@ -1,4 +1,4 @@
-package functions
+package executor
 
 import (
 	"io"
@@ -44,19 +44,19 @@ func serializeFunction(req FunctionRequest, f *SerializingForkFunctionRunner) (*
 
 	var timer *time.Timer
 	if f.ExecTimeout > time.Millisecond*0 {
-		log.Println("Started a timer.")
 
 		timer = time.NewTimer(f.ExecTimeout)
 		go func() {
 			<-timer.C
 
-			log.Printf("Function was killed by ExecTimeout: %s\n", f.ExecTimeout)
+			log.Printf("Function was killed by ExecTimeout: %s\n", f.ExecTimeout.String())
 			killErr := cmd.Process.Kill()
 			if killErr != nil {
 				log.Println("Error killing function due to ExecTimeout", killErr)
 			}
 		}()
 	}
+
 	if timer != nil {
 		defer timer.Stop()
 	}

functions/streaming_runner.go renamed to executor/streaming_runner.go

@@ -1,4 +1,4 @@
-package functions
+package executor
 
 import (
 	"fmt"
@@ -43,14 +43,18 @@ func (f *ForkFunctionRunner) Run(req FunctionRequest) error {
 		go func() {
 			<-timer.C
 
-			fmt.Printf("Function was killed by ExecTimeout: %d\n", f.ExecTimeout)
+			log.Printf("Function was killed by ExecTimeout: %s\n", f.ExecTimeout.String())
 			killErr := cmd.Process.Kill()
 			if killErr != nil {
 				fmt.Println("Error killing function due to ExecTimeout", killErr)
 			}
 		}()
 	}
 
+	if timer != nil {
+		defer timer.Stop()
+	}
+
 	if req.InputReader != nil {
 		defer req.InputReader.Close()
 		cmd.Stdin = req.InputReader

main.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/openfaas-incubator/of-watchdog/config"
-	"github.com/openfaas-incubator/of-watchdog/functions"
+	"github.com/openfaas-incubator/of-watchdog/executor"
 )
 
 func main() {
@@ -78,7 +78,7 @@ func lock() error {
 func makeAfterBurnRequestHandler(watchdogConfig config.WatchdogConfig) func(http.ResponseWriter, *http.Request) {
 
 	commandName, arguments := watchdogConfig.Process()
-	functionInvoker := functions.AfterBurnFunctionRunner{
+	functionInvoker := executor.AfterBurnFunctionRunner{
 		Process:     commandName,
 		ProcessArgs: arguments,
 	}
@@ -88,7 +88,7 @@ func makeAfterBurnRequestHandler(watchdogConfig config.WatchdogConfig) func(http
 
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		req := functions.FunctionRequest{
+		req := executor.FunctionRequest{
 			Process:      commandName,
 			ProcessArgs:  arguments,
 			InputReader:  r.Body,
@@ -109,7 +109,7 @@ func makeAfterBurnRequestHandler(watchdogConfig config.WatchdogConfig) func(http
 }
 
 func makeSerializingForkRequestHandler(watchdogConfig config.WatchdogConfig) func(http.ResponseWriter, *http.Request) {
-	functionInvoker := functions.SerializingForkFunctionRunner{
+	functionInvoker := executor.SerializingForkFunctionRunner{
 		ExecTimeout: watchdogConfig.ExecTimeout,
 	}
 
@@ -122,7 +122,7 @@ func makeSerializingForkRequestHandler(watchdogConfig config.WatchdogConfig) fun
 		}
 
 		commandName, arguments := watchdogConfig.Process()
-		req := functions.FunctionRequest{
+		req := executor.FunctionRequest{
 			Process:       commandName,
 			ProcessArgs:   arguments,
 			InputReader:   r.Body,
@@ -140,7 +140,7 @@ func makeSerializingForkRequestHandler(watchdogConfig config.WatchdogConfig) fun
 }
 
 func makeForkRequestHandler(watchdogConfig config.WatchdogConfig) func(http.ResponseWriter, *http.Request) {
-	functionInvoker := functions.ForkFunctionRunner{
+	functionInvoker := executor.ForkFunctionRunner{
 		ExecTimeout: watchdogConfig.ExecTimeout,
 	}
 
@@ -153,7 +153,7 @@ func makeForkRequestHandler(watchdogConfig config.WatchdogConfig) func(http.Resp
 		}
 
 		commandName, arguments := watchdogConfig.Process()
-		req := functions.FunctionRequest{
+		req := executor.FunctionRequest{
 			Process:      commandName,
 			ProcessArgs:  arguments,
 			InputReader:  r.Body,
@@ -196,7 +196,7 @@ func getEnvironment(r *http.Request) []string {
 
 func makeHTTPRequestHandler(watchdogConfig config.WatchdogConfig) func(http.ResponseWriter, *http.Request) {
 	commandName, arguments := watchdogConfig.Process()
-	functionInvoker := functions.HTTPFunctionRunner{
+	functionInvoker := executor.HTTPFunctionRunner{
 		Process:     commandName,
 		ProcessArgs: arguments,
 	}
@@ -206,7 +206,7 @@ func makeHTTPRequestHandler(watchdogConfig config.WatchdogConfig) func(http.Resp
 
 	return func(w http.ResponseWriter, r *http.Request) {
 
-		req := functions.FunctionRequest{
+		req := executor.FunctionRequest{
 			Process:      commandName,
 			ProcessArgs:  arguments,
 			InputReader:  r.Body,