diff options
| author | Alex Auvolat <alex@adnab.me> | 2018-10-11 11:02:35 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2018-10-11 11:02:35 +0200 |
| commit | 7b6042205e7c6135fae4e0d21dbf7a5975e8491b (patch) | |
| tree | 58fc563458702fb456729b79802eacb547a8fc66 /shardweb | |
| parent | a2f678dc510e642479d61b81148a433edd7b76fe (diff) | |
| download | shard-7b6042205e7c6135fae4e0d21dbf7a5975e8491b.tar.gz shard-7b6042205e7c6135fae4e0d21dbf7a5975e8491b.zip | |
Clean up
Diffstat (limited to 'shardweb')
| -rw-r--r-- | shardweb/config/config.exs | 1 | ||||
| -rw-r--r-- | shardweb/lib/shard_web/controllers/page_controller.ex | 2 | ||||
| -rw-r--r-- | shardweb/lib/shard_web/templates/page/index.html.eex | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/shardweb/config/config.exs b/shardweb/config/config.exs index 2b698c1..a905175 100644 --- a/shardweb/config/config.exs +++ b/shardweb/config/config.exs @@ -20,6 +20,7 @@ config :logger, :console, # Configuration for Shard itself (see shard/config/config.exs for explanations) +config :shard, port: elem (Integer.parse ((System.get_env "PORT") || "4044")), 0 config :shard, network_key: :crypto.hash(:sha256, "ShardTestNet") config :shard, identity_suffix: "ID" config :shard, data_path: Path.join [System.user_home, "shard", "data2"] diff --git a/shardweb/lib/shard_web/controllers/page_controller.ex b/shardweb/lib/shard_web/controllers/page_controller.ex index 305e751..620d779 100644 --- a/shardweb/lib/shard_web/controllers/page_controller.ex +++ b/shardweb/lib/shard_web/controllers/page_controller.ex @@ -18,7 +18,7 @@ defmodule ShardWeb.PageController do end end {port_num, _} = Integer.parse port - Shard.Manager.add_peer(ip_tuple, port_num) + Shard.Manager.add_peer({:inet, ip_tuple, port_num}) rescue _ -> nil end diff --git a/shardweb/lib/shard_web/templates/page/index.html.eex b/shardweb/lib/shard_web/templates/page/index.html.eex index efa651b..34441e5 100644 --- a/shardweb/lib/shard_web/templates/page/index.html.eex +++ b/shardweb/lib/shard_web/templates/page/index.html.eex @@ -6,7 +6,7 @@ <th>Address</th> <th>Port</th> </tr> - <%= for {{:tcp4, ip, port}, pid, auth} <- conn_list() do %> + <%= for {{:inet, ip, port}, pid, auth} <- conn_list() do %> <tr> <td> <%= case auth do %> |