yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 14:15:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use HJSON instead of JSON

Browse source
This commit is contained in:
Neil Alexander 2018-05-09 13:54:31 +01:00
parent fcf7fe71af
commit 45b106168e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
yggdrasil.go
View file

@ -1,8 +1,6 @@
package main
import "bytes"
import "encoding/hex"
import "encoding/json"
import "flag"
import "fmt"
import "io/ioutil"
@ -25,6 +23,8 @@ import "yggdrasil"
import "yggdrasil/config"
import "github.com/kardianos/minwinsvc"
import "github.com/neilalexander/hjson-go"
import "github.com/mitchellh/mapstructure"
type nodeConfig = config.NodeConfig
type Core = yggdrasil.Core
@ -112,8 +112,9 @@ func generateConfig(isAutoconf bool) *nodeConfig {
}
func doGenconf() string {
cfg := generateConfig(false)
bs, err := json.MarshalIndent(cfg, "", " ")
bs, err := hjson.Marshal(cfg)
if err != nil {
panic(err)
}
@ -235,10 +236,12 @@ func main() {
if err != nil {
panic(err)
}
decoder := json.NewDecoder(bytes.NewReader(config))
cfg = generateConfig(false)
err = decoder.Decode(cfg)
if err != nil {
var dat map[string]interface{}
if err := hjson.Unmarshal(config, &dat); err != nil {
panic(err)
}
if err = mapstructure.Decode(dat, &cfg); err != nil {
panic(err)
}
case *genconf: