Skip to content

Commit 6bb3258

Browse files
cabolcabol
committed
Update to Nebulex v2.5.0
1 parent 21bd267 commit 6bb3258

File tree

17 files changed

+196
-61
lines changed

17 files changed

+196
-61
lines changed

‎erlang_cache/elixir_libs/nbx_cache/mix.exs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule NbxCache.MixProject do
55
[
66
app: :nbx_cache,
77
version: "0.1.0",
8-
elixir: "~> 1.9",
8+
elixir: "~> 1.10",
99
build_embedded: Mix.env == :prod,
1010
start_permanent: Mix.env == :prod,
1111
deps: deps()
@@ -18,8 +18,8 @@ defmodule NbxCache.MixProject do
1818

1919
defp deps do
2020
[
21-
{:nebulex, "~> 2.1"},
22-
{:shards, "~> 1.0"}
21+
{:nebulex, "~> 2.5"},
22+
{:shards, "~> 1.1"}
2323
]
2424
end
2525
end

‎erlang_cache/rebar.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
]}.
66

77
{deps, [
8-
{nebulex, {elixir, "nebulex", "2.1.0"}},
9-
{shards, "1.0.1"}
8+
{nebulex, {elixir, "nebulex", "2.5.0"}},
9+
{shards, "1.1.0"}
1010
]}.
1111

1212
{provider_hooks, [

‎near_cache/mix.exs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule NearCache.MixProject do
55
[
66
app: :near_cache,
77
version: "0.1.0",
8-
elixir: "~> 1.10",
8+
elixir: "~> 1.13",
99
build_embedded: Mix.env() == :prod,
1010
start_permanent: Mix.env() == :prod,
1111
deps: deps()
@@ -21,10 +21,10 @@ defmodule NearCache.MixProject do
2121

2222
defp deps do
2323
[
24-
{:nebulex, "~> 2.1"},
25-
{:shards, "~> 1.0"},
24+
{:nebulex, "~> 2.5"},
25+
{:shards, "~> 1.1"},
2626
{:decorator, "~> 1.4"},
27-
{:jchash, "~> 0.1", app: false}
27+
{:jchash, "~> 0.1"}
2828
]
2929
end
3030
end

‎nebulex_bench/mix.exs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule NebulexBench.MixProject do
55
[
66
app: :nebulex_bench,
77
version: "0.1.0",
8-
elixir: "~> 1.10",
8+
elixir: "~> 1.13",
99
build_embedded: Mix.env() == :prod,
1010
start_permanent: Mix.env() == :prod,
1111
deps: deps()
@@ -21,8 +21,8 @@ defmodule NebulexBench.MixProject do
2121

2222
defp deps do
2323
[
24-
{:nebulex, "~> 2.1"},
25-
{:shards, "~> 1.0"},
24+
{:nebulex, "~> 2.5"},
25+
{:shards, "~> 1.1"},
2626
{:basho_bench, github: "mrallen1/basho_bench", ref: "mra-rebar3"}
2727
]
2828
end

‎nebulex_ecto_example/mix.exs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule NebulexEctoExample.MixProject do
55
[
66
app: :nebulex_ecto_example,
77
version: "0.1.0",
8-
elixir: "~> 1.10",
8+
elixir: "~> 1.13",
99
build_embedded: Mix.env() == :prod,
1010
start_permanent: Mix.env() == :prod,
1111
deps: deps()
@@ -21,10 +21,10 @@ defmodule NebulexEctoExample.MixProject do
2121

2222
defp deps do
2323
[
24-
{:nebulex, "~> 2.1"},
25-
{:shards, "~> 1.0"},
24+
{:nebulex, "~> 2.5"},
25+
{:shards, "~> 1.1"},
2626
{:decorator, "~> 1.4"},
27-
{:ecto_sql, "~> 3.4"},
27+
{:ecto_sql, "~> 3.10"},
2828
{:postgrex, ">= 0.0.0"}
2929
]
3030
end

‎nebulex_telemetry_example/mix.exs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defmodule NebulexTelemetryExample.MixProject do
55
[
66
app: :nebulex_telemetry_example,
77
version: "0.1.0",
8-
elixir: "~> 1.10",
8+
elixir: "~> 1.13",
99
start_permanent: Mix.env() == :prod,
1010
deps: deps()
1111
]
@@ -22,11 +22,11 @@ defmodule NebulexTelemetryExample.MixProject do
2222
# Run "mix help deps" to learn about dependencies.
2323
defp deps do
2424
[
25-
{:nebulex, "~> 2.1"},
25+
{:nebulex, "~> 2.5"},
2626
{:decorator, "~> 1.4"},
2727
{:telemetry_metrics, "~> 0.6"},
28-
{:telemetry_poller, "~> 0.5"},
29-
{:telemetry_metrics_statsd, "~> 0.5.0"}
28+
{:telemetry_poller, "~> 1.0"},
29+
{:telemetry_metrics_statsd, "~> 0.6.3"}
3030
]
3131
end
3232
end

‎partitioned_cache/mix.exs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ defmodule PartitionedCache.MixProject do
2121

2222
defp deps do
2323
[
24-
{:nebulex, "~> 2.1"},
25-
{:shards, "~> 1.0"},
24+
{:nebulex, "~> 2.5"},
25+
{:shards, "~> 1.1"},
2626
{:decorator, "~> 1.4"},
27-
{:jchash, "~> 0.1", app: false},
27+
{:jchash, "~> 0.1"},
2828
{:telemetry, "~> 0.4"},
2929
{:telemetry_metrics, "~> 0.6"},
3030
{:telemetry_poller, "~> 0.5"}

‎redis_cache/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ the needed Redis instances with just one command. Make sure you have Docker
3333
installed and then just run:
3434

3535
```
36-
$ docker-compose up
36+
$ docker-compose up -d
3737
```
3838

3939
[docker]: https://www.docker.com/

‎redis_cache/config/config.exs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,44 @@ config :redis_cache, RedisCache.Standalone,
1010
# Redis in client-cluster mode
1111
config :redis_cache, RedisCache.ClientCluster,
1212
mode: :client_side_cluster,
13-
nodes: [
14-
node1: [
15-
conn_opts: [
16-
host: "127.0.0.1",
17-
port: 9001
18-
]
19-
],
20-
node2: [
21-
pool_size: 2,
22-
conn_opts: [
23-
url: "redis://127.0.0.1:9002"
24-
]
25-
],
26-
node3: [
27-
conn_opts: [
28-
host: "127.0.0.1",
29-
port: 9003
13+
client_side_cluster: [
14+
nodes: [
15+
node1: [
16+
conn_opts: [
17+
host: "127.0.0.1",
18+
port: 9001
19+
]
20+
],
21+
node2: [
22+
pool_size: 2,
23+
conn_opts: [
24+
url: "redis://127.0.0.1:9002"
25+
]
26+
],
27+
node3: [
28+
conn_opts: [
29+
host: "127.0.0.1",
30+
port: 9003
31+
]
3032
]
3133
]
3234
]
3335

3436
# Redis Cluster mode
3537
config :redis_cache, RedisCache.RedisCluster,
3638
mode: :redis_cluster,
37-
master_nodes: [
38-
[
39-
host: "127.0.0.1",
40-
port: 7000
41-
],
42-
[
43-
url: "redis://127.0.0.1:7001"
39+
redis_cluster: [
40+
configuration_endpoints: [
41+
endpoint1_conn_opts: [
42+
host: "127.0.0.1",
43+
port: 6380,
44+
password: "password"
45+
]
4446
],
45-
[
46-
url: "redis://127.0.0.1:7002"
47-
]
48-
],
49-
conn_opts: [
50-
host: "127.0.0.1"
47+
# Overrides the master host with the config endpoint, in this case with
48+
# 127.0.0.1 since we're using Docker.
49+
# For prod/real environments this is usually false.
50+
override_master_host: true
5151
]
5252

5353
# Multilevel cache – L1 -> Local and L2 -> RedisCluster

‎redis_cache/docker-compose.yml‎

Lines changed: 104 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,124 @@ services:
55
image: "redis:alpine"
66
ports:
77
- "6379:6379"
8+
networks:
9+
- redis_net
810

911
redis-standalone1:
1012
image: "redis:alpine"
1113
ports:
1214
- "9001:6379"
15+
networks:
16+
- redis_net
1317

1418
redis-standalone2:
1519
image: "redis:alpine"
1620
ports:
1721
- "9002:6379"
22+
networks:
23+
- redis_net
1824

1925
redis-standalone3:
2026
image: "redis:alpine"
2127
ports:
2228
- "9003:6379"
29+
networks:
30+
- redis_net
2331

24-
redis-cluster:
25-
image: grokzen/redis-cluster
32+
cluster-initiator:
33+
image: 'redis:7-alpine'
34+
command: >
35+
redis-cli -a password --cluster create 10.10.10.11:6380 10.10.10.12:6381 10.10.10.13:6382 10.10.10.14:6383 10.10.10.15:6384 10.10.10.16:6385 --cluster-replicas 1 --cluster-yes
36+
networks:
37+
redis_cluster_net:
38+
ipv4_address: 10.10.10.10
39+
depends_on:
40+
- redis-node-0
41+
- redis-node-1
42+
- redis-node-2
43+
- redis-node-3
44+
- redis-node-4
45+
- redis-node-5
46+
redis-node-0:
47+
image: 'redis:7-alpine'
48+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
2649
ports:
27-
- '7000-7005:7000-7005'
28-
environment:
29-
- REDIS_CLUSTER_IP=0.0.0.0
50+
- '6380:6380'
51+
volumes:
52+
- redis-node-0-data:/var/lib/redis
53+
- ./docker/cluster/redis-node-0.conf:/usr/local/etc/redis/redis.conf
54+
networks:
55+
redis_cluster_net:
56+
ipv4_address: 10.10.10.11
57+
redis-node-1:
58+
image: 'redis:7-alpine'
59+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
60+
ports:
61+
- '6381:6381'
62+
volumes:
63+
- redis-node-1-data:/var/lib/redis
64+
- ./docker/cluster/redis-node-1.conf:/usr/local/etc/redis/redis.conf
65+
networks:
66+
redis_cluster_net:
67+
ipv4_address: 10.10.10.12
68+
redis-node-2:
69+
image: 'redis:7-alpine'
70+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
71+
ports:
72+
- '6382:6382'
73+
volumes:
74+
- redis-node-2-data:/var/lib/redis
75+
- ./docker/cluster/redis-node-2.conf:/usr/local/etc/redis/redis.conf
76+
networks:
77+
redis_cluster_net:
78+
ipv4_address: 10.10.10.13
79+
redis-node-3:
80+
image: 'redis:7-alpine'
81+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
82+
ports:
83+
- '6383:6383'
84+
volumes:
85+
- redis-node-3-data:/var/lib/redis
86+
- ./docker/cluster/redis-node-3.conf:/usr/local/etc/redis/redis.conf
87+
networks:
88+
redis_cluster_net:
89+
ipv4_address: 10.10.10.14
90+
redis-node-4:
91+
image: 'redis:7-alpine'
92+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
93+
ports:
94+
- '6384:6384'
95+
volumes:
96+
- redis-node-4-data:/var/lib/redis
97+
- ./docker/cluster/redis-node-4.conf:/usr/local/etc/redis/redis.conf
98+
networks:
99+
redis_cluster_net:
100+
ipv4_address: 10.10.10.15
101+
redis-node-5:
102+
image: 'redis:7-alpine'
103+
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
104+
ports:
105+
- '6385:6385'
106+
volumes:
107+
- redis-node-5-data:/var/lib/redis
108+
- ./docker/cluster/redis-node-5.conf:/usr/local/etc/redis/redis.conf
109+
networks:
110+
redis_cluster_net:
111+
ipv4_address: 10.10.10.16
112+
113+
volumes:
114+
redis-node-0-data:
115+
redis-node-1-data:
116+
redis-node-2-data:
117+
redis-node-3-data:
118+
redis-node-4-data:
119+
redis-node-5-data:
120+
121+
networks:
122+
redis_net:
123+
driver: bridge
124+
redis_cluster_net:
125+
driver: bridge
126+
ipam:
127+
config:
128+
- subnet: 10.10.10.0/24

0 commit comments

Comments
 (0)