mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-12-22 23:25:39 +00:00
Merge branch 'develop' into future
This commit is contained in:
commit
9defa35c66
@ -5,7 +5,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net"
|
"net"
|
||||||
"regexp"
|
"regexp"
|
||||||
"runtime/debug"
|
|
||||||
|
|
||||||
"github.com/gologme/log"
|
"github.com/gologme/log"
|
||||||
|
|
||||||
@ -43,7 +42,7 @@ func (m *Yggdrasil) StartAutoconfigure() error {
|
|||||||
// StartJSON starts a node with the given JSON config. You can get JSON config
|
// StartJSON starts a node with the given JSON config. You can get JSON config
|
||||||
// (rather than HJSON) by using the GenerateConfigJSON() function
|
// (rather than HJSON) by using the GenerateConfigJSON() function
|
||||||
func (m *Yggdrasil) StartJSON(configjson []byte) error {
|
func (m *Yggdrasil) StartJSON(configjson []byte) error {
|
||||||
debug.SetMemoryLimit(1024 * 1024 * 40)
|
setMemLimitIfPossible()
|
||||||
|
|
||||||
logger := log.New(m.log, "", 0)
|
logger := log.New(m.log, "", 0)
|
||||||
logger.EnableLevel("error")
|
logger.EnableLevel("error")
|
||||||
|
10
contrib/mobile/mobile_mem_go120.go
Normal file
10
contrib/mobile/mobile_mem_go120.go
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
//go:build go1.20
|
||||||
|
// +build go1.20
|
||||||
|
|
||||||
|
package mobile
|
||||||
|
|
||||||
|
import "runtime/debug"
|
||||||
|
|
||||||
|
func setMemLimitIfPossible() {
|
||||||
|
debug.SetMemoryLimit(1024 * 1024 * 40)
|
||||||
|
}
|
8
contrib/mobile/mobile_mem_other.go
Normal file
8
contrib/mobile/mobile_mem_other.go
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
//go:build !go1.20
|
||||||
|
// +build !go1.20
|
||||||
|
|
||||||
|
package mobile
|
||||||
|
|
||||||
|
func setMemLimitIfPossible() {
|
||||||
|
// not supported by this Go version
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user