Merge branch 'dev' of https://git.infra.native.computer/NativePlanet/goseg into dev

broadcast/broadcast.go

@@ -7,6 +7,7 @@ import (
 	"goseg/docker"
 	"goseg/startram"
 	"goseg/structs"
+	"io/ioutil"
 	"log/slog"
 	"math"
 	"os"

config/config.go

@@ -31,8 +31,8 @@ var (
 	WifiNetworks       []string
 	HttpOpen           = false
 	UploadSecret       string
-	checkInterval	   = 5 * time.Minute
-	stagingMode		   = os.Getenv("ENVIRONMENT")
+	checkInterval      = 5 * time.Minute
+	stagingMode        = os.Getenv("ENVIRONMENT")
 	confMutex          sync.Mutex
 	versMutex          sync.Mutex
 )
@@ -50,7 +50,7 @@ func init() {
 			BasePath = "/opt/nativeplanet/groundseg"
 		}
 	}
-	pathMsg := fmt.Sprintf("Loading configs from %s",BasePath)
+	pathMsg := fmt.Sprintf("Loading configs from %s", BasePath)
 	logger.Info(pathMsg)
 	confPath := filepath.Join(BasePath, "settings", "system.json")
 	file, err := os.Open(confPath)
@@ -278,4 +278,4 @@ func CheckVersionLoop() {
 			}
 		}
 	}
-}
+}

docker/docker.go

@@ -2,10 +2,10 @@ package docker
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
-	"log/slog"
 	"goseg/structs"
-	"encoding/json"
+	"log/slog"
 	"os"
 
 	"github.com/docker/docker/api/types"
@@ -54,7 +54,6 @@ func GetShipStatus(patps []string) (map[string]string, error) {
 	}
 }
 
-
 // return the name of a container's network
 func GetContainerNetwork(name string) (string, error) {
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
@@ -102,4 +101,4 @@ func GetContainerStats(containerName string) (structs.ContainerStats, error) {
 		MemoryUsage: memUsage,
 		DiskUsage:   diskUsage,
 	}, nil
-}
+}

startram/startram.go

@@ -1,18 +1,18 @@
 package startram
 
 import (
-	"fmt"
 	"encoding/json"
-	"os"
-	"log/slog"
-	"io/ioutil"
-	"net/http"
+	"fmt"
 	"goseg/config"
 	"goseg/structs"
+	"io/ioutil"
+	"log/slog"
+	"net/http"
+	"os"
 )
 
 var (
-	logger  = slog.New(slog.NewJSONHandler(os.Stdout, nil))
+	logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 )
 
 func GetRegions() (map[string]structs.StartramRegion, error) {
@@ -41,4 +41,4 @@ func GetRegions() (map[string]structs.StartramRegion, error) {
 		return regions, err
 	}
 	return regions, nil
-}
+}

structs/structs.go

@@ -155,8 +155,8 @@ type Urbit struct {
 		Running          bool   `json:"running"`
 		URL              string `json:"url"`
 		UrbAlias         bool   `json:"urbAlias"`
-		MemUsage         uint64    `json:"memUsage"`
-		DiskUsage        int64    `json:"diskUsage"`
+		MemUsage         uint64 `json:"memUsage"`
+		DiskUsage        int64  `json:"diskUsage"`
 		LoomSize         int    `json:"loomSize"`
 		DevMode          bool   `json:"devMode"`
 		DetectBootStatus bool   `json:"detectBootStatus"`
@@ -257,4 +257,4 @@ type UrbitDocker struct {
 type ContainerStats struct {
 	MemoryUsage uint64
 	DiskUsage   int64
-}
+}