gaptool-server 0.2.4 → 0.3.0

data/Gemfile

@@ -21,3 +21,5 @@ gem 'redis'
 gem 'aws-sdk'
 gem 'net-ssh'
 gem 'peach'
+gem 'bson_ext'
+gem 'mongo'

data/Gemfile.lock

@@ -9,6 +9,9 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    bson (1.7.1)
+    bson_ext (1.7.1)
+      bson (~> 1.7.1)
     coderay (1.0.8)
     daemons (1.1.9)
     eventmachine (1.0.0)
@@ -24,6 +27,8 @@ GEM
       rdoc
     json (1.7.5)
     method_source (0.8.1)
+    mongo (1.7.1)
+      bson (~> 1.7.1)
     multi_json (1.3.7)
     multi_xml (0.5.1)
     net-ssh (2.6.2)
@@ -69,8 +74,10 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk
+  bson_ext
   bundler
   jeweler (~> 1.8.4)
+  mongo
   net-ssh
   peach
   pry

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/gaptool-server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-server"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey"]
-  s.date = "2013-01-08"
+  s.date = "2013-02-06"
   s.description = "gaptool-server for managing cloud resources"
   s.email = "m@mdb.io"
   s.executables = ["gaptool-server"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/helpers/nicebytes.rb",
     "lib/helpers/partials.rb",
     "lib/helpers/redis.rb",
+    "lib/helpers/services.rb",
     "lib/models/init.rb",
     "lib/models/user.rb",
     "lib/public/css/common.css",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/routes/main.rb",
     "lib/routes/mongodb.rb",
     "lib/routes/redis.rb",
+    "lib/routes/services.rb",
     "lib/views/hosts.erb",
     "lib/views/init.erb",
     "setup.rb",
@@ -66,6 +68,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<peach>, [">= 0"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -80,6 +84,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<aws-sdk>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
       s.add_dependency(%q<peach>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -95,6 +101,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<aws-sdk>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
     s.add_dependency(%q<peach>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/helpers/init.rb

@@ -13,3 +13,6 @@ GaptoolServer.helpers RedisHelpers
 
 require_relative 'mongodb'
 GaptoolServer.helpers MongodbHelpers
+
+require_relative 'services'
+GaptoolServer.helpers ServiceHelpers

data/lib/helpers/mongodb.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'bson_ext'
 require 'mongo'
 module MongodbHelpers
   def collectioncount(dbcollections)

data/lib/helpers/redis.rb

@@ -12,4 +12,18 @@ module RedisHelpers
     end
     return result
   end
+
+  def remotelpush(list, value)
+    @remote_redis = Redis.new(
+      :host => $redis.hget('config', 'remoteredis:host'),
+      :port => 6379 || $redis.hget('config', 'remoteredis:port'),
+      :password => nil || $redis.hget('config', 'remoteredis:password')
+    )
+    begin
+      @remote_redis.lpush(list, value)
+      return { success => "true" }
+    rescue
+      return { success => "false" }
+    end
+  end
 end

data/lib/helpers/services.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+module ServiceHelpers
+  def svcapi_getkey(service)
+    $redis.brpoplpush("apikey:available:#{service}", "apikey:inuse:#{service}", 120)
+  end
+  def svcapi_releasekey(service, key)
+    $redis.lrem("apikey:inuse:#{service}", 1, key)
+    $redis.rpush("apikey:available:#{service}", key)
+  end
+  def svcapi_showkeys(service)
+    unless service == :all
+      @inuse = $redis.lrange("apikey:inuse:#{service}", 0, -1)
+      @available = $redis.lrange("apikey:available:#{service}", 0, -1)
+      return { :inuse => @inuse, :available => @available }
+    else
+      @all = Hash.new
+      $redis.keys('apikey:inuse:*').each do |service|
+        @all[service.gsub('apikey:inuse:', '')][:inuse] = $redis.lrange("apikey:inuse:#{service}", 0, -1)
+      end
+      $redis.keys('apikey:available:*').each do |service|
+        @all[service][:available] = $redis.lrange("apikey:available:#{service}", 0, -1)
+      end
+      return @all
+    end
+  end
+  def svcapi_deletekey(service, key)
+    begin
+      $redis.lrem("apikey:inuse:#{service}", 1, key)
+      $redis.lrem("apikey:available:#{service}", 1, key)
+    rescue
+    end
+  end
+  def svcapi_putkey(service, key)
+    $redis.lpush("apikey:available:#{service}", key)
+  end
+end

data/lib/routes/init.rb

@@ -2,3 +2,4 @@
 require_relative 'main'
 require_relative 'redis'
 require_relative 'mongodb'
+require_relative 'services'

data/lib/routes/main.rb

@@ -21,45 +21,6 @@ class GaptoolServer < Sinatra::Application
     runlist.to_json
   end
 
-  put '/service/:role/:environment' do
-    data = JSON.parse request.body.read
-    count = $redis.incr("service:#{params[:role]}:#{params[:environment]}:#{data['name']}:count")
-    key = "service:#{params[:role]}:#{params[:environment]}:#{data['name']}:#{count}"
-    $redis.hset(key, 'name', data['name'])
-    $redis.hset(key, 'keys', data['keys'])
-    $redis.hset(key, 'weight', data['weight'])
-    $redis.hset(key, 'role', params[:role])
-    $redis.hset(key, 'environment', params[:environment])
-    $redis.hset(key, 'run', data['enabled'])
-    {
-      :role => params[:role],
-      :environment => params[:environment],
-      :service => data['name'],
-      :count => count,
-    }.to_json
-  end
-
-  delete '/service/:role/:environment/:service' do
-    if $redis.get("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:count") == '0'
-      count = 0
-    else
-      count = $redis.decr("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:count")
-      service = eval($redis.range("running", 0, -1).grep(/scoring/).last)
-      runservice(service[:hostname], params[:role], params[:environment], params[:service], 'stop')
-      $redis.del("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:#{count + 1}")
-    end
-    {
-      :role => params[:role],
-      :environment => params[:environment],
-      :service => params[:service],
-      :count => count,
-    }.to_json
-  end
-
-  get '/services' do
-    getservices().to_json
-  end
-
   post '/regenhosts' do
     data = JSON.parse request.body.read
     hostsgen(data['zone'])
@@ -183,10 +144,21 @@ class GaptoolServer < Sinatra::Application
     out.to_json
   end
 
+  get '/instance/:id' do
+    out = Array.new
+    $redis.hgetall($redis.keys("host:*:*:#{params[:id]}").first).to_json
+  end
+
   get '/hosts/:role/:environment' do
     out = Array.new
-    $redis.keys("host:#{params[:role]}:#{params[:environment]}*").each do |host|
-      out << $redis.hgetall(host)
+    unless params[:role] == "ALL"
+      $redis.keys("host:#{params[:role]}:#{params[:environment]}*").each do |host|
+        out << $redis.hgetall(host)
+      end
+    else
+      $redis.keys("host:*:#{params[:environment]}:*").each do |host|
+        out << $redis.hgetall(host)
+      end
     end
     out.to_json
   end

data/lib/routes/redis.rb

@@ -4,4 +4,8 @@ class GaptoolServer < Sinatra::Application
     data = JSON.parse request.body.read
     remotellen(data).to_json
   end
+  post '/status/redis/lpush' do
+    data = JSON.parse request.body.read
+    remotelpush(data['list'], data['value']).to_json
+  end
 end

data/lib/routes/services.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+class GaptoolServer < Sinatra::Application
+
+  get '/servicekeys/get/:service' do
+    svcapi_getkey(params[:service])
+  end
+
+  get '/servicekeys/list/:service' do
+    unless :service.nil?
+      svcapi_showkeys(params[:service]).to_json
+    else
+      svcapi_showkeys(:all).to_json
+    end
+  end
+
+  post '/servicekeys/release/:service' do
+    data = JSON.parse request.body.read
+    svcapi_releasekey(params[:service], data['key'])
+  end
+
+  put '/servicekeys/:service' do
+    data = JSON.parse request.body.read
+    svcapi_putkey(params[:service], data['key'])
+  end
+
+  delete '/servicekeys/:service' do
+    svcapi_deletekey(params[:service], data['key'])
+  end
+
+  put '/service/:role/:environment' do
+    data = JSON.parse request.body.read
+    count = $redis.incr("service:#{params[:role]}:#{params[:environment]}:#{data['name']}:count")
+    key = "service:#{params[:role]}:#{params[:environment]}:#{data['name']}:#{count}"
+    $redis.hset(key, 'name', data['name'])
+    $redis.hset(key, 'keys', data['keys'])
+    $redis.hset(key, 'weight', data['weight'])
+    $redis.hset(key, 'role', params[:role])
+    $redis.hset(key, 'environment', params[:environment])
+    $redis.hset(key, 'run', data['enabled'])
+    {
+      :role => params[:role],
+      :environment => params[:environment],
+      :service => data['name'],
+      :count => count,
+    }.to_json
+  end
+
+  delete '/service/:role/:environment/:service' do
+    if $redis.get("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:count") == '0'
+      count = 0
+    else
+      count = $redis.decr("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:count")
+      service = eval($redis.range("running", 0, -1).grep(/scoring/).last)
+      runservice(service[:hostname], params[:role], params[:environment], params[:service], 'stop')
+      $redis.del("service:#{params[:role]}:#{params[:environment]}:#{params[:service]}:#{count + 1}")
+    end
+    {
+      :role => params[:role],
+      :environment => params[:environment],
+      :service => params[:service],
+      :count => count,
+    }.to_json
+  end
+
+  get '/services' do
+    getservices().to_json
+  end
+
+  get '/servicebalance/:role/:environment' do
+    runlist = balanceservices(params[:role], params[:environment])
+    unless runlist.kind_of? Hash
+      servicestopall(params[:role], params[:environment])
+      runlist.peach do |event|
+        runservice(event[:host][:hostname], params[:role], params[:environment], event[:service][:name], event[:service][:keys], 'start')
+      end
+    end
+    runlist.to_json
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: gaptool-server
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Bailey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 Z
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -79,29 +79,29 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: bson_ext
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: mongo
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shoulda
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,18 +112,18 @@ dependencies:
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rdoc
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.4
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: bundler
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -134,18 +134,18 @@ dependencies:
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: shotgun
+  name: jeweler
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: pry
+  name: simplecov
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -155,6 +155,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: pry
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id015
 description: gaptool-server for managing cloud resources
 email: m@mdb.io
 executables: 
@@ -183,6 +205,7 @@ files:
 - lib/helpers/nicebytes.rb
 - lib/helpers/partials.rb
 - lib/helpers/redis.rb
+- lib/helpers/services.rb
 - lib/models/init.rb
 - lib/models/user.rb
 - lib/public/css/common.css
@@ -191,6 +214,7 @@ files:
 - lib/routes/main.rb
 - lib/routes/mongodb.rb
 - lib/routes/redis.rb
+- lib/routes/services.rb
 - lib/views/hosts.erb
 - lib/views/init.erb
 - setup.rb
@@ -209,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3015715560940527206
+      hash: -4397796870067902928
       segments: 
       - 0
       version: "0"