#106: work in progress: removed compiler warnings

Author: zookzook

lib/mongo.ex

@@ -827,33 +827,64 @@ defmodule Mongo do
     end
   end
 
+  ##
+  # Checks for an error and broadcast the event.
+  ##
+  defp check_for_error({%{"ok" => ok} = response, %{request_id: request_id, operation_id: operation_id, connection_id: connection_id} = event, flags, duration}) when ok == 1 do
+    Events.notify(
+      %CommandSucceededEvent{
+        reply: response,
+        duration: duration,
+        command_name: event.command_name,
+        request_id: request_id,
+        operation_id: operation_id,
+        connection_id: connection_id
+      },
+      :commands
+    )
+
+    {:ok, {flags, response}}
+  end
+
   defp check_for_error({%{"ok" => ok} = response, event, flags, duration}) when ok == 1 do
     Events.notify(
       %CommandSucceededEvent{
         reply: response,
         duration: duration,
-        command_name: event.command_name, ## todo
-        #request_id: event.request_id,
-        #operation_id: event.operation_id,
-        #connection_id: event.connection_id
+        command_name: event.command_name
       },
       :commands
     )
 
     {:ok, {flags, response}}
   end
 
-  defp check_for_error({doc, event, _flags, duration}) do
+  defp check_for_error({doc, %{request_id: request_id, operation_id: operation_id, connection_id: connection_id} = event, _flags, duration}) do
     error = Mongo.Error.exception(doc)
 
     Events.notify(
       %CommandFailedEvent{
         failure: error,
         duration: duration,
         command_name: event.command_name,
-        #request_id: event.request_id,
-        #operation_id: event.operation_id,
-        #connection_id: event.connection_id
+        request_id: request_id,
+        operation_id: operation_id,
+        connection_id: connection_id
+      },
+      :commands
+    )
+
+    {:error, error}
+  end
+
+  defp check_for_error({doc, event, _flags, duration}) do
+    error = Mongo.Error.exception(doc)
+
+    Events.notify(
+      %CommandFailedEvent{
+        failure: error,
+        duration: duration,
+        command_name: event.command_name
       },
       :commands
     )

lib/mongo/monitor.ex

@@ -196,8 +196,8 @@ defmodule Mongo.Monitor do
   ##
   # Starts the streaming mode
   ##
-  defp start_streaming_mode(%{address: address, topology_pid: topology_pid, heartbeat_frequency_ms: heartbeat_frequency_ms, opts: opts} = state, _server_description) do
-    args = [topology_pid, address, heartbeat_frequency_ms, opts]
+  defp start_streaming_mode(%{address: address, topology_pid: topology_pid, opts: opts} = state, _server_description) do
+    args = [topology_pid, address, opts]
     with {:ok, pid} <- StreamingHelloMonitor.start_link(args) do
       ## debug info("Starting streaming mode")
       %{state | mode: :streaming_mode, streaming_pid: pid, heartbeat_frequency_ms: 10_000}

lib/mongo/streaming_hello_monitor.ex

@@ -30,7 +30,7 @@ defmodule Mongo.StreamingHelloMonitor do
   @doc """
   Initialize the monitor process
   """
-  def init([topology_pid, address, heartbeat_frequency_ms, opts]) do
+  def init([topology_pid, address, opts]) do
 
     heartbeat_frequency_ms = 10_000