Skip to content

Commit

Permalink
Merge pull request #34 from parody/rl-bump_elixir
Browse files Browse the repository at this point in the history
Bump Elixir version
  • Loading branch information
fbergero authored Apr 6, 2018
2 parents 0f44a57 + 0bcac70 commit 1330666
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: elixir
sudo: false
elixir: 1.5.1
elixir: 1.6.4
os: linux
otp_release: 20.0
matrix:
Expand Down
6 changes: 3 additions & 3 deletions lib/chronik/aggregate/supervisor.ex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Chronik.Aggregate.Supervisor do
@moduledoc false

use Supervisor
use Supervisor, start: {__MODULE__, :start_link, []}

@name __MODULE__

Expand All @@ -13,13 +13,13 @@ defmodule Chronik.Aggregate.Supervisor do
Supervisor.start_child(__MODULE__, [aggregate, id])
end

def start_link(_opts) do
def start_link do
Supervisor.start_link(__MODULE__, [], name: @name)
end

# Supervisor callbacks

def init(_opts) do
def init([]) do
child = worker(Chronik.Aggregate, [], restart: :transient)
supervise([child], strategy: :simple_one_for_one)
end
Expand Down
4 changes: 2 additions & 2 deletions lib/chronik/application.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ defmodule Chronik.Application do

use Application

@aggregates Chronik.AggregateRegistry
@aggregates Chronik.AggregateRegistry

def start(_type, _args) do
children = [
spec([keys: :unique, name: @aggregates], @aggregates),
{Chronik.Aggregate.Supervisor, []},
Chronik.Aggregate.Supervisor,
]

opts = [strategy: :one_for_one, name: Chronik.Supervisor]
Expand Down
2 changes: 1 addition & 1 deletion lib/chronik/pub_sub/adapters/registry.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Chronik.PubSub.Adapters.Registry do
end

def start_link(_opts) do
Registry.start_link([keys: :duplicate, name: __MODULE__])
Registry.start_link([keys: :duplicate, name: @name])
end

@spec subscribe(opts :: Keyword.t) :: :ok
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule Chronik.Mixfile do
[
app: :chronik,
version: @version,
elixir: "~> 1.5",
elixir: "~> 1.6",
start_permanent: Mix.env == :prod,
test_coverage: [tool: ExCoveralls],
preferred_cli_env: [coveralls: :test],
Expand Down

0 comments on commit 1330666

Please sign in to comment.