@@ -12,7 +12,9 @@ loop do user = video.user # Launch an instance if there isn't one - unless user.current_instance + # see if there are any running instances + instances = user.ec2.describe_instances + unless instances.collect {|s| s[:aws_state]}.any? {|s| s == 'running'} instance = user.ec2.run_instances('ami-d4ec0fbd',1,1,['default'], '').first Merb.logger.debug "Spawned Instance #{instance[:aws_instance_id]}" @@ -88,7 +90,7 @@ loop do minutes = (Time.now - start) / 60 Merb.logger.debug("Instance running for #{minutes}") if minutes > 55 - user.ec2.terminate_instances([user.current_instance]) + user.ec2.terminate_instances(user.ec2.describe_instances.collect {|s| s[:aws_instance_id]}) user.update_attributes({:current_instance => nil, :instance_state => nil, :instance_deployed => false}) user.save! end bin/spawner.rb 98e2415cbfa6b9b8f20f93d8f57b66657be50760 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/panda/commit/2a350bb2df147336c442df0a296c29f9daab569d 2a350bb2df147336c442df0a296c29f9daab569d 2009-11-05T12:04:25-08:00 2009-11-05T12:04:25-08:00 be more care about spawning, and more agressive about terminating instances d1073baee09a31087ca2e4d4ace68bc05bb91d0e Josh Starcher josh@josh-starchers-mac-pro.local