Skip to content

Commit

Permalink
fix(rn): errors at startup
Browse files Browse the repository at this point in the history 
Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
  • Loading branch information
@90dy
90dy committed Dec 11, 2018
1 parent 55ac6f0 commit 82b3b9f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
Binary file added client/react-native/android/core/core-sources.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion client/react-native/common/helpers/update.js
View file
Expand Up @@ -17,7 +17,7 @@ export const getAvailableUpdate = async context => {
return null
}

const [gitData] = deviceData.DeviceInfos.infos
const [gitData] = deviceData.infos
.filter(d => d.key === 'build: git')
.map(({ key, value }) =>
value
Expand Down
7 changes: 4 additions & 3 deletions client/react-native/common/relay/environment.js
View file
Expand Up @@ -53,7 +53,7 @@ const perfLogger = (msg, req, res) => {
: `Server return empty response with Status Code: ${res.status}.`

console.group('%c RELAY %c %s', logStyle.relayERROR, logStyle.title, msg)
console.error(errorReason)
console.warn(errorReason)
}

if (typeof req !== 'undefined') {
Expand All @@ -77,8 +77,8 @@ const setupMiddlewares = async ({ getIp, getPort }) => [
url: `http://${await getIp()}:${await getPort()}/query`,
}),
retryMiddleware({
fetchTimeout: 1000,
retryDelays: () => 1000,
fetchTimeout: 3000,
retryDelays: () => 2000,
beforeRetry: async ({
forceRetry,
abort,
Expand All @@ -97,6 +97,7 @@ const setupMiddlewares = async ({ getIp, getPort }) => [
logStyle.title,
'fetch query error'
)
console.log(req)
console.warn(lastError)

console.warn(
Expand Down
2 changes: 0 additions & 2 deletions client/react-native/gomobile/go.mod
View file
Expand Up @@ -2,10 +2,8 @@ module berty.tech/client/react-native/gomobile

require (
berty.tech/core v0.0.0
github.com/ipfs/go-log v1.5.7
github.com/libp2p/go-buffer-pool v0.1.2-0.20181009094743-058210c5a0d0 // indirect
github.com/pkg/errors v0.8.0
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
go.uber.org/zap v1.9.1
golang.org/x/mobile v0.0.0-20181026062114-a27dd33d354d // indirect
)
Expand Down
14 changes: 14 additions & 0 deletions client/react-native/gomobile/go.sum
View file
Expand Up @@ -62,6 +62,8 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
Expand Down Expand Up @@ -176,12 +178,16 @@ github.com/libp2p/go-libp2p-host v3.0.13+incompatible h1:wWWH5jtgyR6vBABU7OMkL9F
github.com/libp2p/go-libp2p-host v3.0.13+incompatible/go.mod h1:iAthoepYpyqzb89f4RmqzF9+ebsWPFBTvSedSlcWupg=
github.com/libp2p/go-libp2p-interface-connmgr v0.0.19 h1:s454gG+X/CDfSw6PMKCPizdIm0GEwyhrk59Y+8KA320=
github.com/libp2p/go-libp2p-interface-connmgr v0.0.19/go.mod h1:2LbTwxMveREcmkOWo/s6MM7xDvSZbW8J8kYDF4Mj648=
github.com/libp2p/go-libp2p-interface-connmgr v0.0.21 h1:XJtqDLi860LtusR6mY2PCPGeYXmFjm7gXb+ksqwnCpI=
github.com/libp2p/go-libp2p-interface-connmgr v0.0.21/go.mod h1:2LbTwxMveREcmkOWo/s6MM7xDvSZbW8J8kYDF4Mj648=
github.com/libp2p/go-libp2p-interface-pnet v3.0.0+incompatible h1:MNYpwR4opxOJGkDdlV4Vypd7aM6mlt76fad4m4KLk4k=
github.com/libp2p/go-libp2p-interface-pnet v3.0.0+incompatible/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
github.com/libp2p/go-libp2p-kad-dht v4.3.1+incompatible h1:iKhs9i4b4d5lgHWpvL3Ct8oue4GufrsH8shZs946ylQ=
github.com/libp2p/go-libp2p-kad-dht v4.3.1+incompatible/go.mod h1:o7SLAgKvO96vfE0SrzjJfAdCbJjKRfRnbtyUIQg+rqg=
github.com/libp2p/go-libp2p-kad-dht v4.4.8+incompatible h1:ki4NmxpmtBh3Xrme7FE2lTPYAos0CW85zYYCSxIZStI=
github.com/libp2p/go-libp2p-kad-dht v4.4.8+incompatible/go.mod h1:o7SLAgKvO96vfE0SrzjJfAdCbJjKRfRnbtyUIQg+rqg=
github.com/libp2p/go-libp2p-kad-dht v4.4.12+incompatible h1:l5SmsvVxRTFO2+3Wg/91b5ElAQ1fZD7Z40KsWOXgZq8=
github.com/libp2p/go-libp2p-kad-dht v4.4.12+incompatible/go.mod h1:o7SLAgKvO96vfE0SrzjJfAdCbJjKRfRnbtyUIQg+rqg=
github.com/libp2p/go-libp2p-kbucket v2.2.11+incompatible h1:G2tHiXSVhQ9n404QR/L2qoikt+WVYzfkukHqQKXd13c=
github.com/libp2p/go-libp2p-kbucket v2.2.11+incompatible/go.mod h1:MTtm31eal94QTxVOWYTDZ6G1YOJRN2G3ESQHbaPytLk=
github.com/libp2p/go-libp2p-loggables v1.1.22 h1:n25P9uYpSCmZUE5brUZyjoyB9QjyFb4M60A/PM5wr3k=
Expand All @@ -198,6 +204,8 @@ github.com/libp2p/go-libp2p-netutil v0.4.11 h1:eLPFmbMevDPTVee0MPd29Syc3sncvDjDu
github.com/libp2p/go-libp2p-netutil v0.4.11/go.mod h1:lpxjq1x/eUtPYAZAtnC7dKWjQeTuYIYz2ZIPNDDBj3g=
github.com/libp2p/go-libp2p-peer v2.3.8+incompatible h1:ZMYXJdcX/38UBDjrl5BEYRGRgDkc+r+oMSfysyPM/MQ=
github.com/libp2p/go-libp2p-peer v2.3.8+incompatible/go.mod h1:fS2eFKRO1IomwBAf+SuE8P1XOT/AAiqSgVPNIFA7Jc0=
github.com/libp2p/go-libp2p-peer v2.4.0+incompatible h1:1THIuO/h7GuITklYS7RgGCyoVl8aP9XH4NcokcdhDZc=
github.com/libp2p/go-libp2p-peer v2.4.0+incompatible/go.mod h1:fS2eFKRO1IomwBAf+SuE8P1XOT/AAiqSgVPNIFA7Jc0=
github.com/libp2p/go-libp2p-peerstore v1.4.23 h1:CuajEFwUrSOT8YMAGJy++4+bNgjtEPYfyF99DrHi9P0=
github.com/libp2p/go-libp2p-peerstore v1.4.23/go.mod h1:lLfgn0N3z2t+ER57a88K7NTZjMO27ez5TyWSURd428E=
github.com/libp2p/go-libp2p-peerstore v2.0.4+incompatible h1:4dOjYQ/y38mBw9m9/pcAGSv+5PxK4dS37cEOSsaF7zo=
Expand All @@ -213,6 +221,8 @@ github.com/libp2p/go-libp2p-record v4.1.7+incompatible h1:SDxar7iuh4z03b85lr8tVM
github.com/libp2p/go-libp2p-record v4.1.7+incompatible/go.mod h1:fsxr7H89UzzL4pG23Aq2n/5aNAXxdGEbyBVepo8oXy8=
github.com/libp2p/go-libp2p-routing v2.6.5+incompatible h1:wYohT0oyssCQcGjNHFuZhRZMbMAVt5KtsoaHIvgbo0U=
github.com/libp2p/go-libp2p-routing v2.6.5+incompatible/go.mod h1:Alff8O712wWiftX462zvknNmi5RmXtLq/gATcxJ/Hq8=
github.com/libp2p/go-libp2p-routing v2.7.1+incompatible h1:uS0k70z1Bmu6LKTofR6FhbNMBzZsS5uwHzLD3LjT3no=
github.com/libp2p/go-libp2p-routing v2.7.1+incompatible/go.mod h1:Alff8O712wWiftX462zvknNmi5RmXtLq/gATcxJ/Hq8=
github.com/libp2p/go-libp2p-secio v2.0.15+incompatible h1:WqyV9tDkHUaWt0P1UErXMw8aLyjDgPsnXch7BeIIwfI=
github.com/libp2p/go-libp2p-secio v2.0.15+incompatible/go.mod h1:U7wBlYK2sZbUiTaGe6xJd/fyNq40gwn+jBk/iEUbUrA=
github.com/libp2p/go-libp2p-swarm v3.0.7+incompatible h1:dKJJfS5qi1Dxg+KQRHUG1l13O60eA4kjIs801Cxy2P0=
Expand All @@ -221,6 +231,8 @@ github.com/libp2p/go-libp2p-swarm v3.0.19+incompatible h1:GbyyHSORop2m9AGGQsdAVt
github.com/libp2p/go-libp2p-swarm v3.0.19+incompatible/go.mod h1:NHa7cA4/y8OKFw3BHQjLL9pwPDFXkgECO/k+2gqSFuk=
github.com/libp2p/go-libp2p-transport v3.0.13+incompatible h1:mSMrXQklxnAu4qOJQtYB4AUAujPgpmvDkISp+13s2SY=
github.com/libp2p/go-libp2p-transport v3.0.13+incompatible/go.mod h1:lcwgOszllbhvQXul37Kv5YbSYXPoUhRB2Z+Nr3jaBmo=
github.com/libp2p/go-libp2p-transport v3.0.15+incompatible h1:48KfTznuB0vEPcGN+exe3Au92Q4HvcZS3YTVMZbIQhs=
github.com/libp2p/go-libp2p-transport v3.0.15+incompatible/go.mod h1:lcwgOszllbhvQXul37Kv5YbSYXPoUhRB2Z+Nr3jaBmo=
github.com/libp2p/go-libp2p-transport-upgrader v0.1.14 h1:2VzOHRAuaT/rOBmggl0XmV0w17m0Vvt+4NMf/bvuQOU=
github.com/libp2p/go-libp2p-transport-upgrader v0.1.14/go.mod h1:5r+arPlxwtCEF1aVi/fTQF/ZWGSPHLxBov1DlXDevDA=
github.com/libp2p/go-maddr-filter v1.1.9 h1:832yvrYARYYldUTIUR069BpDICwg8kgjebbfTrZpc0M=
Expand Down Expand Up @@ -323,6 +335,8 @@ github.com/uber/jaeger-lib v1.5.0 h1:OHbgr8l656Ub3Fw5k9SWnBfIEwvoHQ+W2y+Aa9D1Uyo
github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
github.com/vektah/gqlparser v0.0.0-20181002002754-f119686bf1d4 h1:HOJJtIE3gsOqjNxZF8LZ0pVMC7VGJgZlTSUbMCoQvTA=
github.com/vektah/gqlparser v0.0.0-20181002002754-f119686bf1d4/go.mod h1:K4QdSSpS2XiHHwzb18kWh3iBljB8rLC8okGXsnQy3Nc=
github.com/vektah/gqlparser v1.0.0 h1:sa/YH/EczjNUFh/ww8ZOsEt/Z7bUMVHI/PH8U0a+taM=
github.com/vektah/gqlparser v1.0.0/go.mod h1:K4QdSSpS2XiHHwzb18kWh3iBljB8rLC8okGXsnQy3Nc=
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc h1:BCPnHtcboadS0DvysUuJXZ4lWVv5Bh5i7+tbIyi+ck4=
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM=
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 h1:5HZfQkwe0mIfyDmc1Em5GqlNRzcdtlv4HTNmdpt7XH0=
Expand Down

0 comments on commit 82b3b9f

Please sign in to comment.