merge with master

2 files changed, 5 insertions, 31 deletions

diff --git a/app/controllers/agents/events_controller.rb b/app/controllers/agents/events_controller.rb
index 6827938..f695feb 100644
--- a/app/controllers/agents/events_controller.rb
+++ b/app/controllers/agents/events_controller.rb
@@ -11,9 +11,11 @@ module Agents
     end
 
     def create
-      message = event_params.merge({agent_id: @agent.id})
-      routing_key = "events.#{event_params[:type]}.#{@agent.id}"
-      Publisher.publish(routing_key, message)
+      publish(EventMessage.new(
+        agent_id: @agent.id,
+        event_type: event_params[:type],
+        data: event_params[:data]
+      ))
       redirect_to agent_events_url, notice: 'Event was successfully created.'
     end
 
diff --git a/app/controllers/agents/files_controller.rb b/app/controllers/agents/files_controller.rb
deleted file mode 100644
index 0f493fb..0000000
--- a/app/controllers/agents/files_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Agents
-  class FilesController < ApplicationController
-    before_action :load_agent
-    before_action do
-      request.format = :json
-    end
-
-    def index
-    end
-
-    def show
-      @fingerprint = params[:id]
-      @file = Disposition.find_by(fingerprint: params[:id])
-      message = {
-        agent_id: params[:id],
-        type: :lookup,
-        data: params[:data]
-      }
-      Publisher.publish("events.scanned.#{@agent.id}", message)
-    end
-
-    private
-
-    def load_agent
-      @agent = Agent.find(params[:agent_id])
-    end
-  end
-end