Skip to content

Commit

Permalink
Merge pull request #252 from mpugach/fix_1_7_deprecations
Browse files Browse the repository at this point in the history
fix 1.7 deprecations
  • Loading branch information
Justin Wood committed Nov 28, 2018
2 parents 01bd4ea + f75b955 commit fe46343
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/mongo/topology.ex
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ defmodule Mongo.Topology do
cond do
type == :single and length(seeds) > 1 ->
{:stop, :single_topology_multiple_hosts}
set_name != nil and not type in [:unknown, :replica_set_no_primary, :single] ->
set_name != nil and not(type in [:unknown, :replica_set_no_primary, :single]) ->
{:stop, :set_name_bad_topology}
true ->
servers = servers_from_seeds(seeds)
Expand Down
4 changes: 2 additions & 2 deletions lib/mongo/topology_description.ex
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ defmodule Mongo.TopologyDescription do
# see https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#actions

defp not_in_servers?(topology, server_description) do
not server_description.address in Map.keys(topology.servers)
not(server_description.address in Map.keys(topology.servers))
end

def invalid_set_name?(topology, server_description) do
Expand Down Expand Up @@ -394,7 +394,7 @@ defmodule Mongo.TopologyDescription do
all_hosts =
server_description.hosts ++ server_description.passives ++ server_description.arbiters
topology = Enum.reduce(all_hosts, topology, fn (host, topology) ->
if not host in Map.keys(topology.servers) do
if not(host in Map.keys(topology.servers)) do
# this is kinda like an "upsert"
put_in(topology.servers[host], ServerDescription.defaults(%{address: host}))
else
Expand Down

0 comments on commit fe46343

Please sign in to comment.