cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-26 00:11:36 +00:00
Code Releases Activity

Case-insensitive checking of null if string, don't print the nodeinfo again

Browse Source
This commit is contained in:
Neil Alexander 2018-12-21 10:04:32 +00:00
parent 586deed0f9
commit f6b0075989
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yggdrasil/nodeinfo.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"runtime" "runtime"
"strings"
"sync" "sync"
"time" "time"
@ -114,7 +115,7 @@ func (m *nodeinfo) setNodeInfo(given interface{}, privacy bool) error {
if nodeinfomap, ok := given.(map[string]interface{}); ok { if nodeinfomap, ok := given.(map[string]interface{}); ok {
for key, value := range nodeinfomap { for key, value := range nodeinfomap {
if _, ok := defaults[key]; ok { if _, ok := defaults[key]; ok {
if strvalue, strok := value.(string); strok && strvalue == "null" || value == nil { if strvalue, strok := value.(string); strok && strings.EqualFold(strvalue, "null") || value == nil {
delete(newnodeinfo, key) delete(newnodeinfo, key)
} }
continue continue
@ -123,7 +124,6 @@ func (m *nodeinfo) setNodeInfo(given interface{}, privacy bool) error {
} }
} }
if newjson, err := json.Marshal(newnodeinfo); err == nil { if newjson, err := json.Marshal(newnodeinfo); err == nil {
m.core.log.Println(string(newjson))
if len(newjson) > 16384 { if len(newjson) > 16384 {
return errors.New("NodeInfo exceeds max length of 16384 bytes") return errors.New("NodeInfo exceeds max length of 16384 bytes")
} }