Merge pull request #1 from davidmasek/dev

Dev

.github/workflows/go.yml

@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "main", "dev" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.23'
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...

README.md

@@ -61,8 +61,13 @@ If you want to use Beacon you currently have to run, host and potentially (gasp)
   - this is an inconvenience for potential users
 - 🔴 notifications
   - currently needs updates after refactors of other parts
-
-
+- 🟡 dev workflow
+  - 🟢 basic github setup
+  - want CI for building/testing 
+- 🟡 testing
+  - 🟢 unit tests for storage
+  - want at least one end-to-end test
+  - want more automation, related to "dev workflow"
 
 
 ## 🚀 Run

cmd/monitor/web.go

@@ -5,9 +5,9 @@ package main
 import (
 	"fmt"
 
+	"github.com/davidmasek/beacon/monitor"
+	"github.com/davidmasek/beacon/storage"
 	"github.com/spf13/viper"
-	"optimisticotter.me/heartbeat-monitor/monitor"
-	"optimisticotter.me/heartbeat-monitor/storage"
 )
 
 func main() {

cmd/notify/notify.go

@@ -9,11 +9,11 @@ import (
 	"log"
 	"time"
 
+	"github.com/davidmasek/beacon/handlers"
+	"github.com/davidmasek/beacon/monitor"
+	"github.com/davidmasek/beacon/status"
+	"github.com/davidmasek/beacon/storage"
 	"github.com/spf13/viper"
-	"optimisticotter.me/heartbeat-monitor/handlers"
-	"optimisticotter.me/heartbeat-monitor/monitor"
-	"optimisticotter.me/heartbeat-monitor/status"
-	"optimisticotter.me/heartbeat-monitor/storage"
 )
 
 func main() {
@@ -75,11 +75,7 @@ func main() {
 			log.Println("[ERROR]", err)
 			continue
 		}
-		timestamps := make([]time.Time, 0)
-		if healthCheck != nil {
-			timestamps = append(timestamps, healthCheck.Timestamp)
-		}
-		serviceStatus, err := config.GetServiceStatus(timestamps)
+		serviceStatus, err := config.GetServiceStatus(healthCheck)
 		if err != nil {
 			log.Println("[ERROR]", err)
 			continue

cmd/server/server.go

@@ -13,9 +13,9 @@ import (
 
 	_ "github.com/mattn/go-sqlite3"
 
-	"optimisticotter.me/heartbeat-monitor/monitor"
-	"optimisticotter.me/heartbeat-monitor/status"
-	"optimisticotter.me/heartbeat-monitor/storage"
+	"github.com/davidmasek/beacon/monitor"
+	"github.com/davidmasek/beacon/status"
+	"github.com/davidmasek/beacon/storage"
 )
 
 func main() {

handlers/common.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"optimisticotter.me/heartbeat-monitor/monitor"
-	"optimisticotter.me/heartbeat-monitor/storage"
+	"github.com/davidmasek/beacon/monitor"
+	"github.com/davidmasek/beacon/storage"
 )
 
 type ServiceReport struct {

handlers/log.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"optimisticotter.me/heartbeat-monitor/monitor"
+	"github.com/davidmasek/beacon/monitor"
 )
 
 const (

monitor/heartbeat_listener.go

@@ -9,7 +9,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/spf13/viper"
 
-	"optimisticotter.me/heartbeat-monitor/storage"
+	"github.com/davidmasek/beacon/storage"
 )
 
 type HeartbeatListener struct {

monitor/monitor.go

@@ -1,8 +1,8 @@
 package monitor
 
 import (
+	"github.com/davidmasek/beacon/storage"
 	"github.com/spf13/viper"
-	"optimisticotter.me/heartbeat-monitor/storage"
 )
 
 type Monitor interface {

monitor/web_pinger.go

@@ -10,8 +10,8 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/davidmasek/beacon/storage"
 	"github.com/spf13/viper"
-	"optimisticotter.me/heartbeat-monitor/storage"
 )
 
 type WebPinger struct {

status/ui_server.go

@@ -10,8 +10,8 @@ import (
 	"sort"
 	"time"
 
-	"optimisticotter.me/heartbeat-monitor/monitor"
-	"optimisticotter.me/heartbeat-monitor/storage"
+	"github.com/davidmasek/beacon/monitor"
+	"github.com/davidmasek/beacon/storage"
 )
 
 type HeartbeatConfig struct {