|
|
@@ -9,9 +9,7 @@ import (
|
|
|
"goseg/structs"
|
|
|
"log/slog"
|
|
|
"math"
|
|
|
- "io/ioutil"
|
|
|
"os"
|
|
|
- "path/filepath"
|
|
|
"reflect"
|
|
|
"strings"
|
|
|
"sync"
|
|
|
@@ -93,7 +91,7 @@ func bootstrapBroadcastState(config structs.SysConfig) (structs.AuthBroadcast, e
|
|
|
},
|
|
|
},
|
|
|
},
|
|
|
- }
|
|
|
+ }
|
|
|
err := UpdateBroadcastState(updates)
|
|
|
if err != nil {
|
|
|
errmsg := fmt.Sprintf("Error updating broadcast state:", err)
|
|
|
@@ -123,8 +121,9 @@ func constructPierInfo(piers []string) (map[string]structs.Urbit, error) {
|
|
|
}
|
|
|
// convert the running status into bools
|
|
|
for pier, status := range pierStatus {
|
|
|
+ // pull urbit info from json
|
|
|
+ dockerConfig := docker.Conf(pier)
|
|
|
// pull docker info from json
|
|
|
- var dockerConfig structs.UrbitDocker
|
|
|
var dockerStats structs.ContainerStats
|
|
|
dockerStats, err := docker.GetContainerStats(pier)
|
|
|
if err != nil {
|
|
|
@@ -132,18 +131,6 @@ func constructPierInfo(piers []string) (map[string]structs.Urbit, error) {
|
|
|
logger.Error(errmsg)
|
|
|
continue
|
|
|
}
|
|
|
- confPath := filepath.Join(config.BasePath, "settings", "pier", pier+".json")
|
|
|
- file, err := ioutil.ReadFile(confPath)
|
|
|
- if err != nil {
|
|
|
- errmsg := fmt.Sprintf("Unable to load %s config: %v", pier, err)
|
|
|
- logger.Error(errmsg)
|
|
|
- continue
|
|
|
- }
|
|
|
- if err := json.Unmarshal(file, &dockerConfig); err != nil {
|
|
|
- errmsg := fmt.Sprintf("Error decoding %s JSON: %v", pier, err)
|
|
|
- logger.Error(errmsg)
|
|
|
- continue
|
|
|
- }
|
|
|
urbit := structs.Urbit{}
|
|
|
if existingUrbit, exists := currentState.Urbits[pier]; exists {
|
|
|
// If the ship already exists in broadcastState, use its current state
|
|
|
@@ -180,7 +167,7 @@ func GetContainerNetworks(containers []string) map[string]string {
|
|
|
for _, container := range containers {
|
|
|
network, err := docker.GetContainerNetwork(container)
|
|
|
if err != nil {
|
|
|
- errmsg := fmt.Sprintf("Error getting container network: %v",err)
|
|
|
+ errmsg := fmt.Sprintf("Error getting container network: %v", err)
|
|
|
logger.Error(errmsg)
|
|
|
continue
|
|
|
} else {
|
|
|
@@ -207,17 +194,17 @@ func UpdateBroadcastState(values map[string]interface{}) error {
|
|
|
if err := recursiveUpdate(field, val); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
BroadcastToClients()
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
// this allows us to insert stuff into nested structs/keys and not overwrite the existing contents
|
|
|
func recursiveUpdate(dst, src reflect.Value) error {
|
|
|
- if !dst.CanSet() {
|
|
|
- return fmt.Errorf("field is not settable")
|
|
|
- }
|
|
|
- // If dst is a struct and src is a map, handle them field by field
|
|
|
+ if !dst.CanSet() {
|
|
|
+ return fmt.Errorf("field is not settable")
|
|
|
+ }
|
|
|
+ // If dst is a struct and src is a map, handle them field by field
|
|
|
if dst.Kind() == reflect.Struct && src.Kind() == reflect.Map {
|
|
|
for _, key := range src.MapKeys() {
|
|
|
dstField := dst.FieldByName(key.String())
|
|
|
@@ -241,33 +228,33 @@ func recursiveUpdate(dst, src reflect.Value) error {
|
|
|
}
|
|
|
return nil
|
|
|
}
|
|
|
- // If both dst and src are maps, handle them recursively
|
|
|
- if dst.Kind() == reflect.Map && src.Kind() == reflect.Map {
|
|
|
- for _, key := range src.MapKeys() {
|
|
|
- srcVal := src.MapIndex(key)
|
|
|
- // If the key doesn't exist in dst, initialize it
|
|
|
- dstVal := dst.MapIndex(key)
|
|
|
- if !dstVal.IsValid() {
|
|
|
- dstVal = reflect.New(dst.Type().Elem()).Elem()
|
|
|
- }
|
|
|
- // Recursive call to handle potential nested maps or structs
|
|
|
- if err := recursiveUpdate(dstVal, srcVal); err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- // Initialize the map if it's nil
|
|
|
- if dst.IsNil() {
|
|
|
- dst.Set(reflect.MakeMap(dst.Type()))
|
|
|
- }
|
|
|
- dst.SetMapIndex(key, dstVal)
|
|
|
- }
|
|
|
- return nil
|
|
|
- }
|
|
|
- // For non-map or non-struct fields, or for direct updates
|
|
|
- if dst.Type() != src.Type() {
|
|
|
- return fmt.Errorf("type mismatch: expected %s, got %s", dst.Type(), src.Type())
|
|
|
- }
|
|
|
- dst.Set(src)
|
|
|
- return nil
|
|
|
+ // If both dst and src are maps, handle them recursively
|
|
|
+ if dst.Kind() == reflect.Map && src.Kind() == reflect.Map {
|
|
|
+ for _, key := range src.MapKeys() {
|
|
|
+ srcVal := src.MapIndex(key)
|
|
|
+ // If the key doesn't exist in dst, initialize it
|
|
|
+ dstVal := dst.MapIndex(key)
|
|
|
+ if !dstVal.IsValid() {
|
|
|
+ dstVal = reflect.New(dst.Type().Elem()).Elem()
|
|
|
+ }
|
|
|
+ // Recursive call to handle potential nested maps or structs
|
|
|
+ if err := recursiveUpdate(dstVal, srcVal); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ // Initialize the map if it's nil
|
|
|
+ if dst.IsNil() {
|
|
|
+ dst.Set(reflect.MakeMap(dst.Type()))
|
|
|
+ }
|
|
|
+ dst.SetMapIndex(key, dstVal)
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ // For non-map or non-struct fields, or for direct updates
|
|
|
+ if dst.Type() != src.Type() {
|
|
|
+ return fmt.Errorf("type mismatch: expected %s, got %s", dst.Type(), src.Type())
|
|
|
+ }
|
|
|
+ dst.Set(src)
|
|
|
+ return nil
|
|
|
}
|
|
|
|
|
|
// return broadcast state
|
nallux