Added instance filtering.

mza · Apr 30, 2009 · e112b2f · e112b2f
1 parent 591471a
commit e112b2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
 
   def index
-    @instances = ec2.describe_instances
+    @instances = Instance.describe
     @job_queue = sqs.queue("jobqueue")
     @pending = Job.pending
     @complete = Job.complete

diff --git a/app/models/instance.rb b/app/models/instance.rb
@@ -8,6 +8,11 @@ def initialize(prefix)
     aws_details
   end
 
+  def self.describe
+    all_instances = ec2.describe_instances
+    all_instances.select {|i| i[:aws_state] == "running" || "reserved"}.select {|i| i[:aws_instance_type] == "m1.large"}.sort_by {|i| i[:aws_availability_zone]}.reverse
+  end
+
   def aws_details
     ec2.describe_instances.each do |instance|
       if instance[:dns_name] == self.name

diff --git a/db/development.sqlite3 b/db/development.sqlite3