Merge remote-tracking branch 'origin/AestekFeedbacks'

Author: tionebsalocin

.travis.yml

@@ -0,0 +1,25 @@
+language: go
+go:
+- 1.x
+script:
+- go get -u
+- GOOS=linux go build -o consul-wrapper-linux
+- GOOS=darwin go build -o consul-wrapper-macos
+- GOOS=windows go build -o consul-wrapper-windows.exe
+sudo: false
+before_deploy:
+- echo "Deploying $TRAVIS_TAG to GitHub releases"
+- tar czf consul-wrapper-linux.tar.gz consul-wrapper-linux
+- tar czf consul-wrapper-macos.tar.gz consul-wrapper-macos
+- zip -r consul-wrapper-windows.zip consul-wrapper-windows.exe
+deploy:
+  provider: releases
+  api_key:
+    secure: NsedjJtO6wzdnrWrX+c/8fxX8njUeNfSzWQqS/ggk9uKZD5dG2VcyRYzdVRbRqXEaiExuE/Id84xSzBZlKkdbBYJByvkZlyoPlr/w8OSkdJo++S9JhNkZWOSM7pjy9XTnGfk12K1TQAOf4JltHxwGRLsvazIOwpGrC9+suIXmxMHGpi73xGdwRRHRVvCrWwSIgFidqRgg4JTPRxhYNGEfRjiwTLnCf/SDK2gp7LlpeYsQqnYU094g00pZn2t/N5DrLtzwa+1jsJ7R8Tz1e6ubFwlI9jUYQ5r5jFrVAi0uTN6q3T+M6PJ6h/GfRp8XPbI28v+6gk0EIx/xXoOiuALXzaole8HETrHMHQwGxa8bvn1qRJT7NSN097oB2U3o9B61sYkyX7GFcmSerK2knKUv036eArirZEM4oSVMBB6GkZY6AuEq3fOyiTEcCPVt9ZGFiPVpfyCgvOHS0MKbaC8Zt9rlrrekeIqBOCepsKttms8y6hgn8cjMkugN3sRLrZWeeX3GL8QutZWECnKlXwA660oE6IR4V7Uf27jWBwZ8ULcU1vEu0OmyLEnn6nNXnX3SsRmqsxoqZNhnUKXWTz51JJog1cyyelevY2tNS8IjWy953Jzh1Ps46NUNDDSFOMCGHN7E80B5CVnNj/Iac1fzXN/4zmL5jtqV+69UlRMSzk=
+  file_glob: true
+  file:
+  - consul-wrapper-*.tar.gz
+  - consul-wrapper-*.zip
+  skip_cleanup: true
+  on:
+    repo: tionebsalocin/consul-wrapper

README.md

@@ -8,12 +8,11 @@ If by any change the command stops working it will be deregistered automatically
 
 ```
 Usage of ./consul-wrapper:
-  -args string
-        String with all arguments
-  -command string
-        Command to run
-  -frequency int
-        Health Check Frequency (in seconds) (default 30)
+
+        ./consul-wrapper [options] -service <ServiceName> <Command> [Args]
+
+  -frequency duration
+        Health Check Frequency (in seconds) (default 30ns)
   -service string
         Consul Service Name
   -token string
@@ -23,11 +22,12 @@ Usage of ./consul-wrapper:
 ## Example
 
 ```
- ./consul-wrapper -service plop -frequency 10 -command consul -args "monitor -log-level trace"
-Registering 'plop' in consul
-Process is running
+ ./consul-wrapper -service plop -frequency 10s consul monitor -log-level trace
+2019/04/11 20:16:44 [ConsulWrapper] Registering 'plop' in consul
+...
+2019/04/11 20:17:14 [ConsulWrapper] Process is running
 ...
-Process is running
-Process exited. Exit code:  0
-Deregistering 'plop' from consul
+2019/04/11 20:17:40 [ConsulWrapper] Error:  signal: killed
+2019/04/11 20:17:40 [ConsulWrapper] Process stopped running. Exit code:  -1
+2019/04/11 20:17:40 [ConsulWrapper] Deregistering 'plop' from consul
 ```

main.go

@@ -6,23 +6,28 @@ import (
 	"log"
 	"os"
 	"os/exec"
-	"strconv"
 	"time"
 
 	"github.com/hashicorp/consul/api"
 )
 
-func processWatcher(pid int, checkName string, frequency int, client *api.Client) {
-	channel := time.Tick(time.Duration(frequency) * time.Second)
+func processWatcher(pid int, checkName string, frequency time.Duration, client *api.Client) {
+	channel := time.Tick(frequency)
 	for range channel {
 		_, err := os.FindProcess(pid)
 		if err != nil {
-			fmt.Println("Process is not running")
-			client.Agent().FailTTL(checkName, "Process is not running")
+			log.Println("[ConsulWrapper] Process is not running")
+			err := client.Agent().FailTTL(checkName, "Process is not running")
+			if err != nil {
+				log.Println("[ConsulWrapper] Failed to send FAIL health check", err)
+			}
 			break
 		}
-		fmt.Println("Process is running")
-		client.Agent().PassTTL(checkName, "Process is running")
+		log.Println("[ConsulWrapper] Process is running")
+		err = client.Agent().PassTTL(checkName, "Process is running")
+		if err != nil {
+			log.Println("[ConsulWrapper] Failed to send PASSING health check", err)
+		}
 	}
 }
 
@@ -37,50 +42,70 @@ func getConsulClient(httpAddr string, token string) *api.Client {
 	return consulClient
 }
 
-func registerConsulService(name string, frequency int, client *api.Client) {
-	fmt.Printf("Registering '%s' in consul\n", name)
-	client.Agent().ServiceRegister(&api.AgentServiceRegistration{
+func registerConsulService(name string, frequency time.Duration, client *api.Client) {
+	log.Printf("[ConsulWrapper] Registering '%s' in consul\n", name)
+	err := client.Agent().ServiceRegister(&api.AgentServiceRegistration{
 		ID:   name,
 		Name: name,
 		Check: &api.AgentServiceCheck{
 			CheckID:                        name,
 			Name:                           name,
-			DeregisterCriticalServiceAfter: strconv.Itoa(2*frequency) + "s",
-			TTL:                            strconv.Itoa(3*frequency) + "s",
+			DeregisterCriticalServiceAfter: fmt.Sprintf("%d", int64(2.1*frequency.Seconds())) + "s",
+			TTL:                            fmt.Sprintf("%d", int64(3.1*frequency.Seconds())) + "s",
 		},
 	})
+	if err != nil {
+		log.Fatal(err)
+	}
 }
 
 func deregisterConsulService(name string, client *api.Client) {
-	fmt.Printf("Deregister '%s' from consul\n", name)
-	client.Agent().ServiceDeregister(name)
+	log.Printf("[ConsulWrapper] Deregistering '%s' from consul\n", name)
+	err := client.Agent().ServiceDeregister(name)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "\t%s [options] -service <ServiceName> <Command> [Args]\n\n", os.Args[0])
+	flag.PrintDefaults()
 }
 
 func main() {
 	tokenPrt := flag.String("token", "", "Consul token used for registration")
 	servicePtr := flag.String("service", "", "Consul Service Name")
-	checkFrequencyPtr := flag.Int("frequency", 30, "Health Check Frequency (in seconds)")
-	commandPtr := flag.String("command", "", "Command to run")
-	argumentsPtr := flag.String("args", "", "String with all arguments")
+	checkFrequencyPtr := flag.Duration("frequency", time.Duration(30), "Health Check Frequency (in seconds)")
+
 	flag.Parse()
+	if *servicePtr == "" {
+		usage()
+		os.Exit(1)
+	}
+	arguments := flag.Args()
+
+	consulClient := getConsulClient("localhost:8500", *tokenPrt)
+	registerConsulService(*servicePtr, *checkFrequencyPtr, consulClient)
 
-	cmd := exec.Command(*commandPtr, *argumentsPtr)
+	cmd := exec.Command(arguments[0], arguments[1:]...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 	if err := cmd.Start(); err != nil {
-		fmt.Println("Failed to start: ", err)
+		log.Println("[ConsulWrapper] Failed to start: ", err)
 		return
 	}
 
-	consulClient := getConsulClient("localhost:8500", *tokenPrt)
-	registerConsulService(*servicePtr, *checkFrequencyPtr, consulClient)
 	go processWatcher(cmd.Process.Pid, *servicePtr, *checkFrequencyPtr, consulClient)
 
 	if err := cmd.Wait(); err != nil {
 		exitCode := cmd.ProcessState.ExitCode()
-		fmt.Printf("Process stopped running. Error: '%s' Exit code: %d\n", err.Error(), exitCode)
+		log.Println("[ConsulWrapper] Error: ", err.Error())
+		log.Println("[ConsulWrapper] Process stopped running. Exit code: ", exitCode)
 		deregisterConsulService(*servicePtr, consulClient)
 		os.Exit(exitCode)
 	}
 
-	fmt.Println("Process exited. Exit code: ", cmd.ProcessState.ExitCode())
+	log.Println("[ConsulWrapper] Process exited. Exit code: ", cmd.ProcessState.ExitCode())
 	deregisterConsulService(*servicePtr, consulClient)
 }