Merge branch 'Prod' into Backend-Modular

Author: Hamzenium

.github/workflows/go-ci-cd.yml

@@ -3,10 +3,10 @@ name: Go CI/CD
 on:
   push:
     branches:
-      - main
+      - Prod  # Trigger pipeline only when code is pushed to the Prod branch
   pull_request:
     branches:
-      - main
+      - Prod  # Also trigger pipeline for pull requests targeting the Prod branch
 
 jobs:
   test:
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.20 
+        go-version: 1.23.4  # Use the same Go version as your local setup
 
     - name: Install dependencies
       run: |

backend/monitor

@@ -30,6 +30,7 @@ var (
 	alertEnabled bool
 	mu           sync.Mutex
 	defaultLimit = setDefaultLimit()
+	shutdownChan = make(chan struct{})
 )
 
 func setDefaultLimit() SetLimit {
@@ -105,6 +106,16 @@ func sendAlert(resource string, usage float64) {
 	}
 }
 
+func shutdownHandler(w http.ResponseWriter, r *http.Request) {
+	if r.Method == http.MethodPost {
+		log.Println("Received shutdown request")
+		close(shutdownChan) // Trigger shutdown
+		w.WriteHeader(http.StatusOK)
+	} else {
+		http.Error(w, "Invalid request method", http.StatusMethodNotAllowed)
+	}
+}
+
 func toggleAlertHandler(w http.ResponseWriter, r *http.Request) {
 	mu.Lock()
 	defer mu.Unlock()
@@ -169,33 +180,41 @@ func monitorResources() {
 		cpuUsage := getCPUUsage()
 		memUsage := getMemoryUsage()
 		diskUsage := getDiskUsage()
-
-		// Check if the resource usage exceeds thresholds and send notifications
 		sendAlert("CPU", cpuUsage)
 		sendAlert("Memory", memUsage)
 		sendAlert("Disk", diskUsage)
 
 		time.Sleep(5 * time.Second)
 	}
 }
-
 func main() {
-	// Initial alert state
 	alertEnabled = true
 	limit := setDefaultLimit()
 	log.Println(limit)
+	server := &http.Server{
+		Addr: ":8080",
+	}
 
-	// Set up routes
 	http.HandleFunc("/toggle-alerts", toggleAlertHandler)
 	http.HandleFunc("/resource-usage", resourceUsageHandler)
 	http.HandleFunc("/limit-changer", toggleLimitHandler)
+	http.HandleFunc("/shutdown", shutdownHandler)
 
-	// Start monitoring resources in the background
 	go monitorResources()
 
-	// Start the backend server
-	log.Println("Starting backend server on port 8080...")
-	if err := http.ListenAndServe(":8080", nil); err != nil {
-		log.Fatal("Error starting server: ", err)
+	go func() {
+		log.Println("Starting backend server on port 8080...")
+		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			log.Fatalf("Error starting server: %v", err)
+		}
+	}()
+
+	<-shutdownChan
+
+	log.Println("Shutting down the server...")
+	if err := server.Close(); err != nil {
+		log.Fatalf("Server shutdown failed: %v", err)
 	}
+
+	log.Println("Server stopped.")
 }

backend/server.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 	"time"
 
@@ -84,6 +85,17 @@ func changeLimits(cpuThreshold, memoryThreshold, diskThreshold float64) error {
 	return nil
 }
 
+// Function to shut down the backend server
+func shutdownServer() error {
+	resp, err := http.Post("http://localhost:8080/shutdown", "application/json", nil)
+	if err != nil {
+		return fmt.Errorf("error sending shutdown request: %v", err)
+	}
+	defer resp.Body.Close()
+
+	return nil
+}
+
 func createGraphWindow(a fyne.App) fyne.Window {
 	w := a.NewWindow("SysGuard")
 
@@ -144,6 +156,17 @@ func createGraphWindow(a fyne.App) fyne.Window {
 		}
 	})
 
+	// Button to close the app
+	closeAppButton := widget.NewButton("Close App", func() {
+		if err := shutdownServer(); err != nil {
+			log.Println("Error shutting down server:", err)
+		} else {
+			log.Println("Server shut down successfully. Exiting application...")
+			a.Quit()
+			os.Exit(0) // Exit the frontend application
+		}
+	})
+
 	go func() {
 		for {
 			usage, err := fetchResourceUsage()
@@ -174,6 +197,7 @@ func createGraphWindow(a fyne.App) fyne.Window {
 		memEntry,
 		diskEntry,
 		changeLimitsButton,
+		closeAppButton, // Add the "Close App" button
 	)
 
 	w.SetContent(content)

frontend/sysguard frontend/monitorfrontend/sysguard renamed to frontend/monitor

@@ -31,7 +31,6 @@ require (
 	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/progrium/darwinkit v0.5.0 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/rymdport/portal v0.3.0 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect

frontend/widget.go

@@ -255,8 +255,6 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/progrium/darwinkit v0.5.0 h1:SwchcMbTOG1py3CQsINmGlsRmYKdlFrbnv3dE4aXA0s=
-github.com/progrium/darwinkit v0.5.0/go.mod h1:PxQhZuftnALLkCVaR8LaHtUOfoo4pm8qUDG+3C/sXNs=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

go.mod

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Get the script's directory
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+
+# Start backend monitor
+echo "Starting backend monitor..."
+if [ -f "$SCRIPT_DIR/backend/monitor" ]; then
+    echo "Found 'monitor' executable in $SCRIPT_DIR/backend."
+    "$SCRIPT_DIR/backend/monitor" &
+    backend_pid=$!
+    echo "Backend monitor started with PID: $backend_pid"
+else
+    echo "Error: 'monitor' file not found in $SCRIPT_DIR/backend."
+    exit 1
+fi
+
+# Start frontend SysGuard
+echo "Starting frontend SysGuard..."
+if [ -f "$SCRIPT_DIR/frontend/monitor" ]; then
+    echo "Found 'sysguard' executable in $SCRIPT_DIR/frontend."
+    "$SCRIPT_DIR/frontend/monitor" &
+    frontend_pid=$!
+    echo "Frontend SysGuard started with PID: $frontend_pid"
+else
+    echo "Error: 'sysguard' file not found in $SCRIPT_DIR/frontend."
+    echo "Stopping backend monitor..."
+    kill $backend_pid
+    exit 1
+fi
+
+# Wait for both processes to complete
+echo "Both backend and frontend are running. Press Ctrl+C to stop."
+trap "echo 'Stopping processes...'; kill $backend_pid $frontend_pid" EXIT
+wait

go.sum

@@ -5,6 +5,8 @@ GOFMT = gofmt
 
 BACKEND_DIR = backend
 FRONTEND_DIR = frontend
+BACKEND_LOG = backend.log
+BACKEND_PORT = 8080  # Update this if needed
 
 deps:
 	@echo "Installing Go dependencies..."
@@ -18,25 +20,39 @@ build-frontend:
 	@echo "Building the frontend application..."
 	$(GO) build -o $(FRONTEND_DIR)/$(BINARY_NAME) $(FRONTEND_DIR)/widget.go
 
-run-backend: build-backend
+build: build-backend build-frontend
+
+run-backend:
 	@echo "Running the backend server..."
-	$(BACKEND_DIR)/$(BINARY_NAME)
+	@$(BACKEND_DIR)/$(BINARY_NAME) > $(BACKEND_LOG) 2>&1 &  # Run in background
+	@echo "Backend started in the background."
+
+wait-backend:
+	@echo "Waiting for backend to start..."
+	@while ! nc -z localhost $(BACKEND_PORT); do sleep 1; done
+	@echo "Backend is running!"
 
-run-frontend: build-frontend
+run-frontend:
 	@echo "Running the frontend application..."
-	$(FRONTEND_DIR)/$(BINARY_NAME)
+	@$(FRONTEND_DIR)/$(BINARY_NAME)
+
+run-all: deps build run-backend wait-backend run-frontend
+
+run-built: run-backend wait-backend run-frontend
 
 clean:
 	@echo "Cleaning up..."
-	rm -f $(BACKEND_DIR)/$(BINARY_NAME) $(FRONTEND_DIR)/$(BINARY_NAME)
+	rm -f $(BACKEND_DIR)/$(BINARY_NAME) $(FRONTEND_DIR)/$(BINARY_NAME) $(BACKEND_LOG)
 
 help:
 	@echo "Makefile for Go application"
 	@echo ""
 	@echo "Available targets:"
-	@echo "  build           - Build both backend and frontend applications"
-	@echo "  run-backend     - Build and run the backend server"
-	@echo "  run-frontend    - Build and run the frontend application"
-	@echo "  clean           - Remove the generated binaries"
-	@echo "  deps            - Install Go dependencies and tidy up"
-	@echo "  help            - Show this help message"
+	@echo "  build        - Build both backend and frontend applications"
+	@echo "  run-backend  - Build and run the backend server"
+	@echo "  wait-backend - Wait until the backend is ready using a real check"
+	@echo "  run-frontend - Build and run the frontend application"
+	@echo "  run-all      - Install deps, build everything, then run backend & frontend"
+	@echo "  clean        - Remove generated binaries and logs"
+	@echo "  deps         - Install Go dependencies and tidy up"
+	@echo "  help         - Show this help message"