collector: move code to /collector

7 files changed, 6 insertions, 1 deletions

diff --git a/lib/collector/control_server.rb b/collector/control_server.rb
index 7c41efa..7c41efa 100644
--- a/lib/collector/control_server.rb
+++ b/collector/control_server.rb
diff --git a/lib/collector/daemon.rb b/collector/daemon.rb
index 2363874..432ac20 100644
--- a/lib/collector/daemon.rb
+++ b/collector/daemon.rb
@@ -1,4 +1,8 @@
 require "msgpack/rpc/transport/unix"
+require_relative "event_queue"
+require_relative "node_connection"
+require_relative "node_manager"
+require_relative "control_server"
 
 module Collector
   module Daemon
diff --git a/lib/collector/event_queue.rb b/collector/event_queue.rb
index 8ae1bd9..8ae1bd9 100644
--- a/lib/collector/event_queue.rb
+++ b/collector/event_queue.rb
diff --git a/lib/collector/node_connection.rb b/collector/node_connection.rb
index 47c0cae..47c0cae 100644
--- a/lib/collector/node_connection.rb
+++ b/collector/node_connection.rb
diff --git a/lib/collector/node_manager.rb b/collector/node_manager.rb
index c6b7f5a..c6b7f5a 100644
--- a/lib/collector/node_manager.rb
+++ b/collector/node_manager.rb
diff --git a/config/application.rb b/config/application.rb
index 55bc680..062c29d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,7 +43,6 @@ module Aclog
 
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl
     end
 
     config.middleware.use(Rack::Config) do |env|
diff --git a/lib/tasks/collector.rake b/lib/tasks/collector.rake
index d6309be..78564a7 100644
--- a/lib/tasks/collector.rake
+++ b/lib/tasks/collector.rake
@@ -12,11 +12,13 @@ namespace :collector do
 
   desc "Start aclog collector (master) in the foreground"
   task run: :environment do
+    require Rails.root.join("collector/daemon")
     Collector::Daemon.start
   end
   
   desc "Start aclog collector (master)"
   task start: :environment do
+    require Rails.root.join("collector/daemon")
     pid = collector_read_pid
     if pid && process_alive?(pid)
       STDERR.puts "Collector daemon is already started (PID: #{pid})"