Skip to content
Snippets Groups Projects
Commit 0e380b30 authored by Jake Taylor's avatar Jake Taylor
Browse files

update version;

add microseconds to verbose logs
parent c85adeb9
No related branches found
No related tags found
1 merge request!23Release
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at // This file was generated by robots at
// 2021-05-19 08:54:19.8920733 -0700 PDT m=+0.193607201 // 2021-05-24 13:15:09.546928 -0500 CDT m=+0.071553794
package api package api
const GITVERSION = `5de412bf Merge branch 'release' into Anne/CI2` const GITVERSION = `c85adeb9 Merge branch 'Anne/CI2' into 'release'`
const SEMVER = "2.6.0" const SEMVER = "2.7.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client const DEPENDENCIES = `module gitlab.com/elixxir/client
go 1.13 go 1.13
...@@ -24,13 +24,13 @@ require ( ...@@ -24,13 +24,13 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1 github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20210518184731-e69b40dd792a gitlab.com/elixxir/comms v0.0.4-0.20210524170509-89dd425cb228
gitlab.com/elixxir/crypto v0.0.7-0.20210518225332-fa641cb78ff5 gitlab.com/elixxir/crypto v0.0.7-0.20210524170447-264b215ce90b
gitlab.com/elixxir/ekv v0.1.5 gitlab.com/elixxir/ekv v0.1.5
gitlab.com/elixxir/primitives v0.0.3-0.20210518183904-7f91a38578ac gitlab.com/elixxir/primitives v0.0.3-0.20210524170524-9780695d2b55
gitlab.com/xx_network/comms v0.0.4-0.20210517205649-06ddfa8d2a75 gitlab.com/xx_network/comms v0.0.4-0.20210524170426-175f698a7b07
gitlab.com/xx_network/crypto v0.0.5-0.20210517205543-4ae99cbb9063 gitlab.com/xx_network/crypto v0.0.5-0.20210524170434-dc9a398a2581
gitlab.com/xx_network/primitives v0.0.4-0.20210517202253-c7b4bd0087ea gitlab.com/xx_network/primitives v0.0.4-0.20210524170438-ab712af183db
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
......
...@@ -23,6 +23,7 @@ import ( ...@@ -23,6 +23,7 @@ import (
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
"gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/id"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"strconv" "strconv"
"strings" "strings"
...@@ -613,34 +614,19 @@ func initLog(threshold uint, logPath string) { ...@@ -613,34 +614,19 @@ func initLog(threshold uint, logPath string) {
jww.INFO.Printf("log level set to: TRACE") jww.INFO.Printf("log level set to: TRACE")
jww.SetStdoutThreshold(jww.LevelTrace) jww.SetStdoutThreshold(jww.LevelTrace)
jww.SetLogThreshold(jww.LevelTrace) jww.SetLogThreshold(jww.LevelTrace)
jww.SetFlags(log.LstdFlags | log.Lmicroseconds)
} else if threshold == 1 { } else if threshold == 1 {
jww.INFO.Printf("log level set to: DEBUG") jww.INFO.Printf("log level set to: DEBUG")
jww.SetStdoutThreshold(jww.LevelDebug) jww.SetStdoutThreshold(jww.LevelDebug)
jww.SetLogThreshold(jww.LevelDebug) jww.SetLogThreshold(jww.LevelDebug)
jww.SetFlags(log.LstdFlags | log.Lmicroseconds)
} else { } else {
jww.INFO.Printf("log level set to: TRACE") jww.INFO.Printf("log level set to: INFO")
jww.SetStdoutThreshold(jww.LevelInfo) jww.SetStdoutThreshold(jww.LevelInfo)
jww.SetLogThreshold(jww.LevelInfo) jww.SetLogThreshold(jww.LevelInfo)
} }
} }
func isValidUser(usr []byte) (bool, *id.ID) {
if len(usr) != id.ArrIDLen {
return false, nil
}
for _, b := range usr {
if b != 0 {
uid, err := id.Unmarshal(usr)
if err != nil {
jww.WARN.Printf("Could not unmarshal user: %s", err)
return false, nil
}
return true, uid
}
}
return false, nil
}
func askToCreateChannel(recipientID *id.ID) bool { func askToCreateChannel(recipientID *id.ID) bool {
for { for {
fmt.Printf("This is the first time you have messaged %v, "+ fmt.Printf("This is the first time you have messaged %v, "+
......
...@@ -18,7 +18,7 @@ import ( ...@@ -18,7 +18,7 @@ import (
) )
// Change this value to set the version for this build // Change this value to set the version for this build
const currentVersion = "2.6.0" const currentVersion = "2.7.0"
func Version() string { func Version() string {
out := fmt.Sprintf("Elixxir Client v%s -- %s\n\n", api.SEMVER, out := fmt.Sprintf("Elixxir Client v%s -- %s\n\n", api.SEMVER,
......
...@@ -17,13 +17,13 @@ require ( ...@@ -17,13 +17,13 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1 github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20210521205603-a6a49d762f62 gitlab.com/elixxir/comms v0.0.4-0.20210524170509-89dd425cb228
gitlab.com/elixxir/crypto v0.0.7-0.20210521205349-cb0c5cdd44e3 gitlab.com/elixxir/crypto v0.0.7-0.20210524170447-264b215ce90b
gitlab.com/elixxir/ekv v0.1.5 gitlab.com/elixxir/ekv v0.1.5
gitlab.com/elixxir/primitives v0.0.3-0.20210521205228-746e9ff840fb gitlab.com/elixxir/primitives v0.0.3-0.20210524170524-9780695d2b55
gitlab.com/xx_network/comms v0.0.4-0.20210521205156-5dbbf700c6c7 gitlab.com/xx_network/comms v0.0.4-0.20210524170426-175f698a7b07
gitlab.com/xx_network/crypto v0.0.5-0.20210521205053-9423260a7c0f gitlab.com/xx_network/crypto v0.0.5-0.20210524170434-dc9a398a2581
gitlab.com/xx_network/primitives v0.0.4-0.20210521183842-3b12812ac984 gitlab.com/xx_network/primitives v0.0.4-0.20210524170438-ab712af183db
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment