Merge pull request #19 from ncode/juliano/refactoring

updates and refactoring

Author: ncode

cmd/run.go

@@ -16,7 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	"golang.org/x/net/context"
+	"context"
 	"os"
 
 	"github.com/ncode/ballot/internal/ballot"
@@ -38,6 +38,7 @@ var runCmd = &cobra.Command{
 					"caller": "run",
 					"step":   "New",
 				}).Error(err)
+				os.Exit(1)
 			}
 
 			err = b.Run()

configs/consul_with_3_nodes/consul-agent-1/my-service.json

@@ -1,3 +1,3 @@
-FROM scratch
+FROM oraclelinux:9
 COPY ballot /ballot
 ENTRYPOINT ["/ballot"]

configs/consul_with_3_nodes/consul-agent-2/my-service.json

@@ -7,9 +7,10 @@ build:
 
 docker-build:
 	docker build -t ncode/ballot:dev .
+	rm ballot
 
 up:
 	docker compose up
 
-dowm:
-	docker compose dowm
+down:
+	docker compose down

configs/consul_with_3_nodes/consul-agent-3/my-service.json

@@ -5,7 +5,7 @@ election:
   enabled:
     - my-service
   services:
-    my_service:
+    my-service:
       id: my-service1
       key: service/my-service
       token:

configs/consul_with_3_nodes/Dockerfile configs/development/Dockerfileconfigs/consul_with_3_nodes/Dockerfile renamed to configs/development/Dockerfile

@@ -5,7 +5,7 @@ election:
   enabled:
     - my-service
   services:
-    my_service:
+    my-service:
       id: my-service2
       key: service/my-service
       token:

configs/consul_with_3_nodes/Makefile configs/development/Makefileconfigs/consul_with_3_nodes/Makefile renamed to configs/development/Makefile

@@ -5,7 +5,7 @@ election:
   enabled:
     - my-service
   services:
-    my_service:
+    my-service:
       id: my-service3
       key: service/my-service
       token:

…consul_with_3_nodes/ballot-1/ballot.yaml configs/development/ballot-1/ballot.yamlconfigs/consul_with_3_nodes/ballot-1/ballot.yaml renamed to configs/development/ballot-1/ballot.yaml configs/consul_with_3_nodes/ballot-1/ballot.yaml renamed to configs/development/ballot-1/ballot.yaml

@@ -0,0 +1,22 @@
+service {
+  id      = "my-service1"
+  name    = "my-service"
+  tags    = ["v1"]
+  address = "127.0.0.1"
+  port    = 8000
+
+  enable_tag_override = true
+
+  check {
+    ID                             = "service:election1"
+    DeregisterCriticalServiceAfter = "90m"
+    Args                           = ["/bin/ls", "/state/ready1"]
+    Interval                       = "10s"
+    timeout                        = "5s"
+  }
+
+  weights {
+    passing = 10
+    warning = 1
+  }
+}