fixes #10

Author: zookzook

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Enhancements
    * The driver provides now client metadata 
+   * Added support for connecting via UNIX sockets (`:socket` and `:socket_dir`)
 
 ## v0.5.3
 

lib/mongo.ex

@@ -83,8 +83,15 @@ defmodule Mongo do
     * `:database` - The database to use (required)
     * `:hostname` - The host to connect to (require)
     * `:port` - The port to connect to your server (default: 27017)
-    * `:url` - A mongo connection url. Can be used in place of `:hostname` and
-      `:database` (optional)
+    * `:url` - A mongo connection url. Can be used in place of `:hostname` and `:database` (optional)
+    * `:socket_dir` - Connect to MongoDB via UNIX sockets in the given directory.
+      The socket name is derived based on the port. This is the preferred method
+      for configuring sockets and it takes precedence over the hostname. If you
+      are connecting to a socket outside of the MongoDB convection, use
+     `:socket` instead.
+    * `:socket` - Connect to MongoDB via UNIX sockets in the given path.
+      This option takes precedence over `:hostname` and `:socket_dir`.
+    * `:database` (optional)
     * `:seeds` - A list of host names in the cluster. Can be used in place of
       `:hostname` (optional)
     * `:username` - The User to connect with (optional)

lib/mongo/mongo_db_connection.ex

@@ -95,15 +95,17 @@ defmodule Mongo.MongoDBConnection do
     end
   end
 
-  defp tcp_connect(opts, s) do
-    host      = (opts[:hostname] || "localhost") |> to_charlist
-    port      = opts[:port] || 27017
-    sock_opts = [:binary, active: false, packet: :raw, nodelay: true]
-                ++ (opts[:socket_options] || [])
+  defp tcp_connect(opts, state) do
 
-    s = Map.put(s, :host, "#{host}:#{port}")
+    {host, port} = Utils.hostname_port(opts)
+    sock_opts   = [:binary, active: false, packet: :raw, nodelay: true] ++ (opts[:socket_options] || [])
 
-    case :gen_tcp.connect(host, port, sock_opts, s.connect_timeout) do
+    s = case host do
+      {:local, socket} -> Map.put(state, :host, socket)
+      hostname         -> Map.put(state, :host, "#{hostname}:#{port}")
+    end
+
+    case :gen_tcp.connect(host, port, sock_opts, state.connect_timeout) do
       {:ok, socket} ->
         # A suitable :buffer is only set if :recbuf is included in
         # :socket_options.
@@ -113,7 +115,7 @@ defmodule Mongo.MongoDBConnection do
 
         {:ok, %{s | connection: {:gen_tcp, socket}}}
 
-      {:error, reason} -> {:error, Mongo.Error.exception(tag: :tcp, action: "connect", reason: reason, host: s.host)}
+      {:error, reason} -> {:error, Mongo.Error.exception(tag: :tcp, action: "connect", reason: reason, host: state.host)}
     end
   end
 

lib/mongo/topology.ex

@@ -62,9 +62,10 @@ defmodule Mongo.Topology do
   # see https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#configuration
   @doc false
   def init(opts) do
-    seeds = Keyword.get(opts, :seeds, [
-      Keyword.get(opts, :hostname, "localhost") <> ":" <> to_string(Keyword.get(opts, :port, 27017))
-    ])
+    #seeds = Keyword.get(opts, :seeds, [
+    #  Keyword.get(opts, :hostname, "localhost") <> ":" <> to_string(Keyword.get(opts, :port, 27017))
+    #])
+    seeds = Keyword.get(opts, :seeds, [seed(opts)])
     type = Keyword.get(opts, :type, :unknown)
     set_name = Keyword.get(opts, :set_name, nil)
     local_threshold_ms = Keyword.get(opts, :local_threshold_ms, 15)
@@ -99,6 +100,13 @@ defmodule Mongo.Topology do
     end
   end
 
+  defp seed(opts) do
+    case Mongo.MongoDBConnection.Utils.hostname_port(opts) do
+      {{:local, socket}, 0} -> socket
+      {hostname, port}      -> "#{hostname}:#{port}"
+    end
+  end
+
   def terminate(_reason, state) do
     Enum.each(state.connection_pools, fn {_address, pid} -> GenServer.stop(pid) end)
     Enum.each(state.monitors, fn {_address, pid} -> GenServer.stop(pid) end)

lib/mongo_db_connection/utils.ex

@@ -136,4 +136,16 @@ defmodule Mongo.MongoDBConnection.Utils do
   def digest_password(_username, password, :sha256) do
     password
   end
+
+  def hostname_port(opts) do
+    port = opts[:port] || 27017
+    case Keyword.fetch(opts, :socket) do
+      {:ok, socket} -> {{:local, socket}, 0}
+      :error ->
+        case Keyword.fetch(opts, :socket_dir) do
+          {:ok, dir} -> {{:local, "#{dir}/mongodb-#{port}.sock"}, 0}
+          :error     -> {(opts[:hostname] || "localhost") |> to_charlist, port}
+        end
+    end
+  end
 end

test/mongo/connection_test.exs

@@ -47,9 +47,31 @@ defmodule Mongo.ConnectionTest do
     end)
   end
 
+  defp connect_socket_dir do
+    assert {:ok, pid} = Mongo.start_link(socket_dir: "/tmp", database: "mongodb_test")
+    pid
+  end
+
+  defp connect_socket do
+    assert {:ok, pid} = Mongo.start_link(socket: "/tmp/mongodb-27017.sock", database: "mongodb_test")
+    pid
+  end
+
+  @tag :socket
+  test "connect socket_dir" do
+    pid = connect_socket_dir()
+    assert {:ok, %{"ok" => 1.0}} = Mongo.ping(pid)
+  end
+
+  @tag :socket
+  test "connect socket" do
+    pid = connect_socket()
+    assert {:ok, %{"ok" => 1.0}} = Mongo.ping(pid)
+  end
+
   test "connect and ping" do
     pid = connect()
-    assert {:ok, %{"ok" => 1.0}} =  Mongo.ping(pid)
+    assert {:ok, %{"ok" => 1.0}} = Mongo.ping(pid)
   end
 
   @tag :ssl

test/test_helper.exs

@@ -11,7 +11,7 @@ version =
   |> List.to_tuple
 
 options = []
-options = if System.get_env("CI") do [ssl: true] ++ options else options end
+options = if System.get_env("CI") do [ssl: true, socket: true] ++ options else options end
 options = if version < {3, 4, 0} do [mongo_3_4: true] ++ options else options end
 options = if version < {3, 6, 0} do [change_streams: true] ++ options else options end