Update erlang and deps (#18)

* MSPF-469: Update erlang and deps

* MSPF-469: Fix config and update deps
This commit is contained in:
Sergey Elin 2019-06-25 17:20:00 +03:00 committed by GitHub
parent eb42455013
commit f63648f764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 22 deletions

2
Jenkinsfile vendored
View File

@ -33,7 +33,7 @@ build('url-shortener', 'docker-host', finalHook) {
sh 'make wc_xref'
}
runStage('dialyze') {
withWsCache("_build/default/rebar3_21.1.1_plt") {
withWsCache("_build/default/rebar3_21.3.8.4_plt") {
sh 'make wc_dialyze'
}
}

View File

@ -14,10 +14,10 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)
# Base image for the service
BASE_IMAGE_NAME := service-erlang
BASE_IMAGE_TAG := bdb3e60ddc70044bae1aa581d260d3a9803a2477
BASE_IMAGE_TAG := 294d280ff42e6c0cc68ab40fe81e76a6262636c4
# Build image tag to be used
BUILD_IMAGE_TAG := a166721af4f3454345d443bc681b91962d259d40
BUILD_IMAGE_TAG := cd38c35976f3684fe7552533b6175a4c3460e88b
CALL_ANYWHERE := all submodules rebar-update compile xref lint dialyze start devrel release clean distclean

View File

@ -4,9 +4,9 @@
{registered, []},
{mod, {shortener, []}},
{applications, [
logger_logstash_formatter,
kernel,
stdlib,
logger_logstash_formatter,
scoper,
genlib,
jose,

@ -1 +1 @@
Subproject commit 870b70a63af18fc7a02c9ff26b06132d2b1993cb
Subproject commit ea4aa042f482551d624fd49a570d28488f479e93

View File

@ -1,7 +1,4 @@
[
{scoper, [
{storage, scoper_storage_logger}
]},
@ -57,18 +54,10 @@
{logger_level, info},
{logger, [
{handler, default, logger_std_h, #{
level => error,
config => #{
type => standard_error
},
formatter => {logger_formatter, #{
depth => 30
}}
}},
{handler, console_logger, logger_std_h, #{
level => debug,
config => #{
type => {file, "/var/log/shortener/console.json"},
type => file,
file => "/var/log/shortener/console.json",
sync_mode_qlen => 20,
burst_limit_enable => true,
burst_limit_max_count => 600,

View File

@ -41,7 +41,7 @@
{<<"lager">>,{pkg,<<"lager">>,<<"3.6.4">>},0},
{<<"logger_logstash_formatter">>,
{git,"git@github.com:rbkmoney/logger_logstash_formatter.git",
{ref,"17eaad7940c8df5a8c511388c6063bb049bab3d2"}},
{ref,"54c371215e3d73b2a868bc6375e523f95e826fe3"}},
0},
{<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
{<<"mg_proto">>,
@ -66,16 +66,16 @@
{<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.1">>},1},
{<<"thrift">>,
{git,"https://github.com/rbkmoney/thrift_erlang.git",
{ref,"240bbc842f6e9b90d01bd07838778cf48752b510"}},
{ref,"d393ef9cdb10f3d761ba3a603df2b2929dc19a10"}},
1},
{<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.3.1">>},2},
{<<"woody">>,
{git,"git@github.com:rbkmoney/woody_erlang.git",
{ref,"698a84296742dba1ff338334b30193c019cc18cc"}},
{ref,"5ee89dd0b2d52ff955a4107a8d9dc0f8fdd365a0"}},
0},
{<<"woody_user_identity">>,
{git,"git@github.com:rbkmoney/woody_erlang_user_identity.git",
{ref,"fe973ab27fee9fc1cc39281e88816c7b6dce84c6"}},
{ref,"6eca18a62ccd7f0b3b62f9b2119b328b1798859d"}},
0}]}.
[
{pkg_hash,[