Revert "Merge pull request #155 from shermdog/RE-7014-cinext"

This reverts commit cc03a86f6a, reversing
changes made to 5aaab7c5c2.

lib/vmpooler.rb

@@ -7,7 +7,6 @@ module Vmpooler
   require 'rbvmomi'
   require 'redis'
   require 'sinatra/base'
-  require "statsd-ruby"
   require 'time'
   require 'timeout'
   require 'yaml'
@@ -53,13 +52,6 @@ module Vmpooler
       parsed_config[:graphite]['prefix'] ||= 'vmpooler'
     end
 
-    # statsd is an addition and my not be present in YAML configuration
-    if parsed_config[:statsd]
-      if parsed_config[:statsd]['server']
-        parsed_config[:statsd]['prefix'] ||= 'vmpooler'
-      end
-    end
-
     if parsed_config[:tagfilter]
       parsed_config[:tagfilter].keys.each do |tag|
         parsed_config[:tagfilter][tag] = Regexp.new(parsed_config[:tagfilter][tag])
@@ -87,14 +79,6 @@ module Vmpooler
     end
   end
 
-  def self.new_statsd(server, port)
-    if server.nil? || server.empty?
-      nil
-    else
-      Statsd.new server, port
-    end
-  end
-
   def self.pools(conf)
     conf[:pools]
   end

lib/vmpooler/api.rb

@@ -42,10 +42,9 @@ module Vmpooler
     use Vmpooler::API::Reroute
     use Vmpooler::API::V1
 
-    def configure(config, redis, statsd, environment = :production)
+    def configure(config, redis, environment = :production)
       self.settings.set :config, config
       self.settings.set :redis, redis
-      self.settings.set :statsd, statsd
       self.settings.set :environment, environment
     end
 

lib/vmpooler/api/v1.rb

@@ -12,16 +12,6 @@ module Vmpooler
       Vmpooler::API.settings.redis
     end
 
-    def statsd
-      Vmpooler::API.settings.statsd
-    end
-
-    def statsd_prefix
-      if Vmpooler::API.settings.statsd
-        Vmpooler::API.settings.config[:statsd]['prefix'] ? Vmpooler::API.settings.config[:statsd]['prefix'] : 'vmpooler'
-      end
-    end
-
     def config
       Vmpooler::API.settings.config[:config]
     end
@@ -42,16 +32,13 @@ module Vmpooler
       newhash = {}
 
       hash.each do |key, val|
-        if Vmpooler::API.settings.config[:alias][key]
-          key = Vmpooler::API.settings.config[:alias][key]
-        end
-
         if backend.exists('vmpooler__ready__' + key)
           newhash[key] = val
-        elsif backend.exists('vmpooler__empty__' + key)
-          newhash['empty'] = (newhash['empty'] || 0) + val.to_i
         else
-          newhash['invalid'] = (newhash['invalid'] || 0) + val.to_i
+          if Vmpooler::API.settings.config[:alias][key]
+            newkey = Vmpooler::API.settings.config[:alias][key]
+            newhash[newkey] = val
+          end
         end
       end
 
@@ -107,10 +94,8 @@ module Vmpooler
           vm = fetch_single_vm(template)
           if !vm
             failed = true
-            statsd.increment(statsd_prefix + '.checkout.fail.' + template, 1)
             break
           else
-            statsd.increment(statsd_prefix + '.checkout.success.' + template, 1)
             vms << [ template, vm ]
           end
         end
@@ -390,16 +375,8 @@ module Vmpooler
       content_type :json
       result = { 'ok' => false }
 
-      if jdata
-        empty = jdata.delete('empty')
-        invalid = jdata.delete('invalid')
-        statsd.increment(statsd_prefix + '.checkout.empty', empty) if empty
-        statsd.increment(statsd_prefix + '.checkout.invalid', invalid) if invalid
-        unless jdata.empty?
-          result = atomically_allocate_vms(jdata)
-        else
-          status 404
-        end
+      if jdata and !jdata.empty?
+        result = atomically_allocate_vms(jdata)
       else
         status 404
       end
@@ -423,16 +400,8 @@ module Vmpooler
       content_type :json
       result = { 'ok' => false }
 
-      if payload
-        empty = payload.delete('empty')
-        invalid = payload.delete('invalid')
-        statsd.increment(statsd_prefix + '.checkout.empty', empty) if empty
-        statsd.increment(statsd_prefix + '.checkout.invalid', invalid) if invalid
-        unless payload.empty?
-          result = atomically_allocate_vms(payload)
-        else
-          status 404
-        end
+      if payload and !payload.empty?
+        result = atomically_allocate_vms(payload)
       else
         status 404
       end

lib/vmpooler/pool_manager.rb

@@ -1,15 +1,12 @@
 module Vmpooler
   class PoolManager
-    def initialize(config, logger, redis, graphite = nil, statsd = nil)
+    def initialize(config, logger, redis, graphite=nil)
       $config = config
 
       # Load logger library
       $logger = logger
 
-      # statsd and graphite are mutex in the context of vmpooler
-      if statsd
-        $statsd = statsd
-      elsif graphite
+      unless graphite.nil?
         $graphite = graphite
       end
 
@@ -261,8 +258,7 @@ module Vmpooler
         $redis.decr('vmpooler__tasks__clone')
 
         begin
-          $statsd.timing($config[:statsd]['prefix'] + ".clone.#{vm['template']}", finish) if $statsd
-          $graphite.log($config[:graphite]['prefix'] + ".clone.#{vm['template']}", finish) if $graphite
+          $graphite.log($config[:graphite]['prefix'] + ".clone.#{vm['template']}", finish) if defined? $graphite
         rescue
         end
       end
@@ -298,7 +294,7 @@ module Vmpooler
 
           $logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds")
 
-          $graphite.log($config[:graphite]['prefix'] + ".destroy.#{pool}", finish) if $graphite
+          $graphite.log($config[:graphite]['prefix'] + ".destroy.#{pool}", finish) if defined? $graphite
         end
       end
     end
@@ -569,10 +565,7 @@ module Vmpooler
       total = $redis.scard('vmpooler__pending__' + pool['name']) + ready
 
       begin
-        if $statsd
-          $statsd.gauge($config[:statsd]['prefix'] + '.ready.' + pool['name'], $redis.scard('vmpooler__ready__' + pool['name']))
-          $statsd.gauge($config[:statsd]['prefix'] + '.running.' + pool['name'], $redis.scard('vmpooler__running__' + pool['name']))
-        elsif $graphite
+        if defined? $graphite
           $graphite.log($config[:graphite]['prefix'] + '.ready.' + pool['name'], $redis.scard('vmpooler__ready__' + pool['name']))
           $graphite.log($config[:graphite]['prefix'] + '.running.' + pool['name'], $redis.scard('vmpooler__running__' + pool['name']))
         end

lib/vmpooler/statsd.rb

@@ -1,9 +0,0 @@
-require 'rubygems' unless defined?(Gem)
-
-module Vmpooler
-  class Statsd
-    def initialize(server = 'statsd', port = 8125)
-      @server = Statsd.new(server, port)
-    end
-  end
-end