Fixes for hanging jobs, more verbose ci output

Author: jc21

backend/internal/jobqueue/main.go

@@ -16,7 +16,7 @@ var (
 func Start() {
 	ctx, cancel = context.WithCancel(context.Background())
 	q := &Queue{
-		jobs:   make(chan Job),
+		jobs:   make(chan Job, 10),
 		ctx:    ctx,
 		cancel: cancel,
 	}

backend/internal/jobqueue/models.go

@@ -10,6 +10,7 @@ type Queue struct {
 	jobs   chan Job
 	ctx    context.Context
 	cancel context.CancelFunc
+	mu     sync.Mutex
 }
 
 // Job - holds logic to perform some operations during queue execution.
@@ -41,6 +42,8 @@ func (q *Queue) AddJobs(jobs []Job) {
 
 // AddJob sends job to the channel.
 func (q *Queue) AddJob(job Job) {
+	q.mu.Lock()
+	defer q.mu.Unlock()
 	q.jobs <- job
 }
 

docker/dev/dnsrouter-config.json

@@ -24,5 +24,8 @@
             "internal": null,
             "default_upstream": "127.0.0.11"
         }
-    ]
-}
+    ],
+    "cache": {
+        "disabled": true
+    }
+}

docker/docker-compose.ci.yml

@@ -75,6 +75,7 @@ services:
     image: jc21/dnsrouter
     volumes:
       - ./dev/dnsrouter-config.json.tmp:/dnsrouter-config.json:ro
+    entrypoint: /dnsrouter -v -c /dnsrouter-config.json
 
   cypress:
     image: "${IMAGE}-cypress:ci-${BUILD_NUMBER}"

test/cypress/Dockerfile

@@ -2,9 +2,11 @@ FROM cypress/included:13.15.1
 
 COPY --chown=1000 ./test /test
 
-# Disable Cypress CLI colors
-ENV FORCE_COLOR=0
-ENV NO_COLOR=1
+# Disable Cypress CLI colors by default
+ARG FORCE_COLOR=0
+ARG NO_COLOR=1
+ENV FORCE_COLOR=$FORCE_COLOR \
+	NO_COLOR=$NO_COLOR
 
 WORKDIR /test
 RUN yarn install && yarn cache clean