- fix: fixed watcher error that causes sending alert on every check

- feat: added proper rest server url on start

Author: exelban

.github/workflows/docker.yaml .github/workflows/release.yaml.github/workflows/docker.yaml renamed to .github/workflows/release.yaml

@@ -13,10 +13,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Log in to GitHub Container Registry
@@ -34,14 +40,18 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
+          build-args: VERSION=${{ env.TAG }}
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/jam:${{ env.TAG }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/jam:latest
+            ${{ github.repository_owner }}/jam:${{ env.TAG }}
+            ${{ github.repository_owner }}/jam:latest
 
       - name: Build and push Docker image to GitHub Container Registry
         uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
+          build-args: VERSION=${{ env.TAG }}
           tags: |
             ghcr.io/${{ github.repository_owner }}/jam:${{ env.TAG }}
             ghcr.io/${{ github.repository_owner }}/jam:latest
@@ -63,7 +73,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ env.TAG }}
-          name: Release ${{ env.TAG }}
+          name: ${{ env.TAG }}
           body: ${{ env.CHANGELOG }}
           draft: false
           prerelease: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM exelban/baseimage:golang-latest as build-app
+FROM exelban/baseimage:golang-latest AS build-app
 
 ARG VERSION
 
@@ -17,4 +17,4 @@ FROM exelban/baseimage:alpine-latest
 EXPOSE 8822
 WORKDIR /app
 COPY --from=build-app /app/bin/main /app/main
-ENTRYPOINT ./main
+ENTRYPOINT ["./main"]

api/server.go

@@ -42,7 +42,11 @@ func (s *Server) Run(router http.Handler) error {
 		s.IdleTimeout = 60 * time.Second
 	}
 
-	log.Printf("[INFO] http rest server on %s:%d", s.Address, s.Port)
+	addr := "http://localhost"
+	if s.Address != "" {
+		addr = s.Address
+	}
+	log.Printf("[INFO] http rest server on %s:%d", addr, s.Port)
 
 	s.mu.Lock()
 	s.srv = &http.Server{

main.go

@@ -86,8 +86,6 @@ func main() {
 }
 
 func create(ctx context.Context, args arguments) (*app, error) {
-	log.Printf("[DEBUG] %+v", args)
-
 	cfg, err := types.NewConfig(ctx, args.ConfigPath)
 	if err != nil {
 		return nil, fmt.Errorf("new config: %w", err)

pkg/monitor/watcher.go

@@ -89,7 +89,7 @@ func (w *watcher) validate(status bool) {
 		w.failureCount = 0
 		if w.host.SuccessThreshold == nil || w.successCount >= *w.host.SuccessThreshold {
 			newStatus := types.UP
-			if w.status != types.Unknown {
+			if w.status != types.Unknown && w.status != types.UP {
 				if err := w.notify.Set(w.host.Alerts, newStatus, w.host.String()); err != nil {
 					log.Print(err)
 				}
@@ -108,7 +108,7 @@ func (w *watcher) validate(status bool) {
 		w.successCount = 0
 		if w.host.FailureThreshold == nil || w.failureCount >= *w.host.FailureThreshold {
 			newStatus := types.DOWN
-			if w.status != types.Unknown {
+			if w.status != types.Unknown && w.status != types.DOWN {
 				if err := w.notify.Set(w.host.Alerts, newStatus, w.host.String()); err != nil {
 					log.Print(err)
 				}

types/host_test.go

@@ -2,8 +2,7 @@ package types
 
 import (
 	"crypto/md5"
-	"encoding/hex"
-	"fmt"
+	"encoding/base64"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
@@ -55,26 +54,28 @@ func TestHost_String(t *testing.T) {
 func TestHost_GenerateID(t *testing.T) {
 	url := "url"
 	group := "group"
-	hasher := md5.New()
-
-	hasher.Write([]byte(url))
-	hash := hex.EncodeToString(hasher.Sum(nil))
-
-	hasher.Reset()
-	hasher.Write([]byte(fmt.Sprintf("%s%s", url, group)))
-	groupHash := hex.EncodeToString(hasher.Sum(nil))
 
 	t.Run("url only", func(t *testing.T) {
 		h := Host{
 			URL: url,
 		}
-		require.Equal(t, hash, h.GenerateID())
+		hasher := md5.New()
+		hasher.Write([]byte(url))
+		hash := hasher.Sum(nil)
+		expected := base64.URLEncoding.EncodeToString(hash)[:6]
+		require.Equal(t, expected, h.GenerateID())
 	})
+
 	t.Run("url and group", func(t *testing.T) {
 		h := Host{
 			URL:   url,
 			Group: &group,
 		}
-		require.Equal(t, groupHash, h.GenerateID())
+		hasher := md5.New()
+		input := append([]byte(url), []byte(group)...)
+		hasher.Write(input)
+		hash := hasher.Sum(nil)
+		expected := base64.URLEncoding.EncodeToString(hash)[:6]
+		require.Equal(t, expected, h.GenerateID())
 	})
 }