fixed handeling of correct up time count

handelers/statushandler.go

@@ -2,13 +2,13 @@ package handelers
 
 import (
 	"net/http"
-	"time"
 	"fmt"
 	"encoding/json"
+	"time"
 )
 
 
-var serviceStartTime time.Time
+
 
 // Funksjon for å hente statuskode fra et API
 func getAPIStatus(url string) (int, error) {
@@ -22,14 +22,10 @@ func getAPIStatus(url string) (int, error) {
 	return resp.StatusCode, nil
 }
 
-// Funksjon for å beregne oppetid
-func getUptime() int64 {
-	return int64(time.Since(serviceStartTime).Seconds())
-}
+
 
 // Handler for Diagnostics endpoint
-func DiagnosticsHandler(w http.ResponseWriter, r *http.Request) {
-	serviceStartTime = time.Now()
+func DiagnosticsHandler(w http.ResponseWriter, r *http.Request, serviceStartTime time.Time) {
 	// Hent statuskoder fra eksterne API-er
 	countriesNowStatus, err := getAPIStatus("http://129.241.150.113:3500/api/v0.1/countries")
 	if err != nil {
@@ -48,7 +44,7 @@ func DiagnosticsHandler(w http.ResponseWriter, r *http.Request) {
 		"countriesnowapi": fmt.Sprintf("%d", countriesNowStatus),
 		"restcountriesapi": fmt.Sprintf("%d", restCountriesStatus),
 		"version":          "v1", // Versjon av API
-		"uptime":           getUptime(), // Oppetid i sekunder
+		"uptime":           getUptime(serviceStartTime), // Oppetid i sekunder
 	}
 
 	// Sett Content-Type til application/json
@@ -57,3 +53,8 @@ func DiagnosticsHandler(w http.ResponseWriter, r *http.Request) {
 	// Returner JSON-responsen
 	json.NewEncoder(w).Encode(response)
 }
+
+// Funksjon for å beregne oppetid
+func getUptime(serviceStartTime time.Time) int64 {
+	return int64(time.Since(serviceStartTime).Seconds()) // Bruk serviceStartTime fra parameter
+}
\ No newline at end of file

main.go

@@ -3,11 +3,19 @@ package main
 import (
 	"fmt"
 	"net/http"
+	"time"
 	"git.gvk.idi.ntnu.no/Mathilde/cloud/handelers"
 )
 
+var serviceStartTime time.Time
+
+
 func main() {
-	http.HandleFunc("/status/", handelers.DiagnosticsHandler)
+	serviceStartTime = time.Now()
+
+	http.HandleFunc("/status/", func(w http.ResponseWriter, r *http.Request) {
+		handelers.DiagnosticsHandler(w, r, serviceStartTime)
+	})
 	http.HandleFunc("/", handelers.HomeHandler)
 	http.HandleFunc("/countryinfo/v1/info/", handelers.CountryInfoHandler)
 

main/main.go

+package main
+
+import (
+	"fmt"
+	"net/http"
+	"time"
+	"git.gvk.idi.ntnu.no/Mathilde/cloud/handelers"
+)
+
+var serviceStartTime time.Time
+
+func main() {
+	serviceStartTime = time.Now()
+
+	// Send serviceStartTime til DiagnosticsHandler
+	http.HandleFunc("/status/", func(w http.ResponseWriter, r *http.Request) {
+		handelers.DiagnosticsHandler(w, r, serviceStartTime)
+	})
+	http.HandleFunc("/", handelers.HomeHandler)
+	http.HandleFunc("/countryinfo/v1/info/", handelers.CountryInfoHandler)
+
+	fmt.Println("Server running on port 8080...")
+	if err := http.ListenAndServe(":8080", nil); err != nil {
+		fmt.Printf("Server failed to start: %s\n", err)
+	}
+}
\ No newline at end of file