merge this weekends emergency commits

VERSION

@@ -1 +1 @@
-3.0.9-rc.1
+3.1.1-rc.1

lib/farmbot/logger.ex

@@ -103,11 +103,7 @@ defmodule Farmbot.Logger do
       HTTP.post!("/api/logs", Poison.encode!(logs))
       GenEvent.call(Elixir.Logger, __MODULE__, :post_success)
     rescue
-      e ->
-        unless e ==  %MatchError{term: {:error, :no_token}} do
-          IO.puts "Encountered an error uploading Logs!: #{inspect e}"
-        end
-        GenEvent.call(Elixir.Logger, __MODULE__, :post_fail)
+      _ -> GenEvent.call(Elixir.Logger, __MODULE__, :post_fail)
     end
   end
 
@@ -168,8 +164,7 @@ defmodule Farmbot.Logger do
     end
   end
 
-  @spec filter_module(binary, atom) :: binary
-  [
+  @modules [
     :"Elixir.Nerves.InterimWiFi",
     :"Elixir.Nerves.NetworkInterface",
     :"Elixir.Nerves.InterimWiFi.WiFiManager.EventHandler",
@@ -178,26 +173,12 @@ defmodule Farmbot.Logger do
     :"Elixir.Nerves.InterimWiFi.Udhcpc",
     :"Elixir.Nerves.NetworkInterface.Worker",
     :"Elixir.Nerves.InterimWiFi.DHCPManager.EventHandler",
-    :"Elixir.Nerves.WpaSupplicant"
-    # :"Elixir.Farmbot.System.NervesCommon.EventManager"
-  ] |> Enum.map(fn(module) ->
-    defp filter_module(_, unquote(module)) do
-      # IO.puts "filtering: #{inspect mod}"
-      # "FLERP: #{inspect mod}"
-      @filtered
-    end
-  end)
+    :"Elixir.Nerves.WpaSupplicant",
+    :"Elixir.Farmbot.System.NervesCommon.EventManager"
+  ]
 
-  defp filter_module(message, _module) do
-    # m = Atom.to_string(module)
-    # if String.contains?(m, "Nerves") do
-    #   IO.puts "HEY: #{m}"
-    #   message
-    # else
-    #   message
-    # end
-    message
-  end
+  for module <- @modules, do: defp filter_module(_, unquote(module)), do: @filtered
+  defp filter_module(message, _module), do: message
 
   @lint false
   defp filter_text(">>" <> m), do: filter_text("#{Sync.device_name()}" <> m)

lib/farmbot/system/filesystem/config_storage.ex

@@ -72,7 +72,6 @@ defmodule Farmbot.System.FS.ConfigStorage do
   end
 
   def handle_call({:replace_config_file, new_state}, _, old_state) do
-    Logger.info ">> is replacing #{inspect old_state} with #{inspect new_state}"
     write!(:ok, new_state)
   end
 

rel/config.exs

@@ -15,12 +15,10 @@ use Mix.Releases.Config,
 
 environment :dev do
   set cookie: :"gz`tgx[zM,ueL[g{Ji62{jiawNDZHH~PGkNQLa&R>R7c0SKziff4L,*&ZNG)(qu0"
-  # set pre_start_hook: "rel/hooks/pre_start"
 end
 
 environment :prod do
   set cookie: :"gz`tgx[zM,ueL[g{Ji62{jiawNDZHH~PGkNQLa&R>R7c0SKziff4L,*&ZNG)(qu0"
-  # set pre_start_hook: "rel/hooks/pre_start"
 end
 
 # You may define one or more releases in this file.