delayed_job_monitor 0.0.2 → 0.0.4

data/lib/delayed_job_monitor/application/app.rb

@@ -1,5 +1,7 @@
-require 'sinatra'
 require 'sinatra/base'
+require 'active_support'
+require 'active_record'
+require 'delayed_job'
 require 'haml'
 
 module DelayedJobMonitor
@@ -13,9 +15,12 @@ module DelayedJobMonitor
 
     def delayed_job
       begin
-        DelayedJobMonitor::Job
+        if DelayedJobMonitor.connected?
+          DelayedJobMonitor::Job
+        else
+          nil
+        end
       rescue
-        false
       end
     end
     

data/lib/delayed_job_monitor/job.rb

@@ -1,31 +1,5 @@
-#delayed_job_monitor.establish_connection
-
 module DelayedJobMonitor
 	class Job < ActiveRecord::Base
   	self.table_name = "delayed_jobs"
-
-		def self.queues
-			@queues = delayed_job_monitor::Job.select(:queue).map(&:queue).compact.uniq.sort
-			return @queues
-		end
-
-		def host
-			unless DelayedJobMonitor[:database]["host"].blank?
-				return DelayedJobMonitor[:database]["host"]
-			else
-				return "localhost"
-			end
-		end
-
-		def description
-			details = {}
-			parsed_handler = self.handler.split(/\n/)
-			parsed_handler.map{|x| details[x.split(":")[0].strip.split(/\//).last] = x.split(/\:|\/|\s/).last.strip unless x.blank?}
-			target_class = details["ActiveRecord"]
-			target_id = details["id"].to_s.gsub(/\W/,"").to_i if details["id"].present?
-			performable_class = details["object"] if details["object"].present?
-			performable_method = details["method_name"] if details["method_name"].present?
-			return "Perform #{performable_class}:#{performable_method} on #{target_class}##{target_id}"
-		end
 	end
 end

data/lib/delayed_job_monitor/server.rb

@@ -6,6 +6,7 @@ module DelayedJobMonitor
 		@@instance_collector = []
 		def initialize(name="default",host="localhost",rails_path=nil,username=nil,password=nil)
 			unless host == "localhost"
+				p host
 				@connection = Net::SSH.start(host,username,:password=>password)
 				@username = username
 			else

data/lib/delayed_job_monitor/version.rb

@@ -1,3 +1,3 @@
 module DelayedJobMonitor
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/delayed_job_monitor.rb

@@ -20,7 +20,7 @@ module DelayedJobMonitor
 	def self.establish_connection
 		begin
 			if DelayedJobMonitor[:database]["host"].nil?
-				raise "No database connection defined in config.yml"
+				p "No database connection defined in config.yml"
 			else
 				if defined? connection
 					p "There is already a DB connection locally...closing"
@@ -34,7 +34,7 @@ module DelayedJobMonitor
 				return connection
 			end
 		rescue
-		 raise "ERROR: Could not connect to the Delayed::Job database. REASON: #{$!}. Please check your configuration settings."
+		 raise true
 		end
 	end
 
@@ -47,22 +47,40 @@ module DelayedJobMonitor
 		end
 	end
 
+	def self.connected?
+		if defined? DelayedJobMonitor.connection
+			return true
+		else
+			return false
+		end
+	end
+
 	def self.stand_alone_mode?
 		!ENV["RAILS_ENV"].present?
 	end
 
 	def self.initialize_servers
-		DelayedJobMonitor[:hosts].each do |host|
-			DelayedJobMonitor::Server.new(host["name"],host["host"],host["rails_path"],host["username"],host["password"])
-		end
-		if delayed_job_running_locally?
+		unless DelayedJobMonitor[:hosts].first["host"].nil?
+
+			DelayedJobMonitor[:hosts].each do |host|
+				DelayedJobMonitor::Server.new(host["name"],host["host"],host["rails_path"],host["username"],host["password"])
+			end
+
+			if delayed_job_running_locally?
+				DelayedJobMonitor::Server.new
+			end
+			
+			return DelayedJobMonitor::Server.servers
+		else
 			DelayedJobMonitor::Server.new
+			p "No hosts configured. Connecting to localhost"
 		end
-		return DelayedJobMonitor::Server.servers
 	end
 
 	def self.start!
-		DelayedJobMonitor.establish_connection
+		if stand_alone_mode? && !connected?
+			DelayedJobMonitor.establish_connection
+		end
 		DelayedJobMonitor.initialize_servers
 		DelayedJobMonitor::App.run!
 	end
@@ -79,6 +97,4 @@ if DelayedJobMonitor.stand_alone_mode?
 			return nil
 		end
 	end
-end
-
-DelayedJobMonitor.establish_connection
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: