gaptool-server 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/gaptool-server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-server"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey"]

data/lib/app.rb

@@ -14,6 +14,13 @@ class GaptoolServer < Sinatra::Application
   enable :raise_errors
   enable :dump_errors
 
+  error do
+    content_type :json
+    status 500
+
+    {:result => 'error', :message => env['sinatra.error'].message}.to_json
+  end
+
   before do
     error 401 unless $redis.hget('users', env['HTTP_X_GAPTOOL_USER']) == env['HTTP_X_GAPTOOL_KEY']
     error 401 unless env['HTTP_X_GAPTOOL_USER'] && env['HTTP_X_GAPTOOL_KEY']

data/lib/routes/main.rb

@@ -75,14 +75,10 @@ class GaptoolServer < Sinatra::Application
     data = JSON.parse request.body.read
     AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{data['zone']}.amazonaws.com")
     @ec2 = AWS::EC2.new
-    begin
-      @instance = @ec2.instances[data['id']]
-      res = @instance.terminate
-      res = $redis.del($redis.keys("*#{data['id']}"))
-      out = {data['id'] => {'status'=> 'terminated'}}
-    rescue
-      error 404
-    end
+    @instance = @ec2.instances[data['id']]
+    res = @instance.terminate
+    res = $redis.del($redis.keys("*#{data['id']}"))
+    out = {data['id'] => {'status'=> 'terminated'}}
     out.to_json
   end
 

metadata

@@ -2,7 +2,7 @@
 name: gaptool-server
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Matt Bailey
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4255522910746715047
+      hash: -3957808604451578110
       segments: 
       - 0
       version: "0"