Merge branch 'master' of github.com:ava-labs/gecko

This commit is contained in:
StephenButtolph 2020-03-13 17:32:49 -04:00
commit acaf5400ef
2 changed files with 2 additions and 6 deletions

View File

@ -15,7 +15,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"sync" "sync"
"time"
"unsafe" "unsafe"
"github.com/ava-labs/salticidae-go" "github.com/ava-labs/salticidae-go"
@ -47,10 +46,7 @@ import (
) )
const ( const (
defaultChannelSize = 1 maxMessageSize = 1 << 25 // maximum size of a message sent with salticidae
externalRequestTimeout = 2 * time.Second
internalRequestTimeout = 250 * time.Millisecond
maxMessageSize = 1 << 25
) )
// MainNode is the reference for node callbacks // MainNode is the reference for node callbacks

View File

@ -171,7 +171,7 @@ func (l *Log) format(level Level, format string, args ...interface{}) string {
return fmt.Sprintf("%s[%s]%s %s\n", return fmt.Sprintf("%s[%s]%s %s\n",
level, level,
time.Now().Format("01-02|15:04:05"), time.Now().Format("01-02|15:04:05.000"),
prefix, prefix,
text) text)
} }