wildcloud-keeper 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.3 (13.1.2012)
+
+* depend on wildcloud-configuration
+* change in configuration file structure
+
 ## 0.0.2 (4.1.2012)
 
 * remove heartbeat

data/lib/wildcloud/keeper/configuration.rb

@@ -13,6 +13,9 @@
 # limitations under the License.
 
 require 'yaml'
+
+require 'wildcloud/configuration'
+
 require 'wildcloud/keeper/logger'
 
 module Wildcloud
@@ -20,12 +23,11 @@ module Wildcloud
 
     def self.configuration
       return @configuration if @configuration
-      file = '/etc/wildcloud/keeper.yml'
-      unless File.exists?(file)
-        file = './keeper.yml'
+      config = Wildcloud::Configuration.load('keeper')
+      config.sources.each do |source|
+        self.logger.info('Configuration', "Loaded configuration from #{source}")
       end
-      Keeper.logger.info('Configuration', "Loading from file #{file}")
-      @configuration = YAML.load_file(file)
+      @configuration = config.configuration
     end
 
   end

data/lib/wildcloud/keeper/runtime.rb

@@ -38,7 +38,7 @@ module Wildcloud
         @queue = Queue.new
         @thread_pool = []
 
-        Keeper.configuration['node']['workers'].times do |i|
+        Keeper.configuration['workers'].times do |i|
           Keeper.logger.debug('Runtime', "Starting thread ##{i}")
           Thread.new(i) do |id|
             Thread.current.abort_on_exception = false

data/lib/wildcloud/keeper/transport/amqp.rb

@@ -32,14 +32,14 @@ module Wildcloud
           Keeper.add_amqp_logger(@connection)
 
           @channel = AMQP::Channel.new(@connection)
-          @channel.prefetch(Keeper.configuration['node']['workers'])
+          @channel.prefetch(Keeper.configuration['workers'])
 
           @exchange = @channel.topic('wildcloud.keeper')
           @queue = @channel.queue("wildcloud.keeper.node.#{Keeper.configuration['node']['name']}")
           @queue.bind(@exchange, :routing_key => 'nodes')
           @queue.bind(@exchange, :routing_key => "node.#{Keeper.configuration['node']['name']}")
 
-          if Keeper.configuration['node']['builder']
+          if Keeper.configuration['builder']
             @builders = @channel.queue("wildcloud.keeper.build")
             @builders.bind(@exchange, :routing_key => 'build')
           end

data/lib/wildcloud/keeper/version.rb

@@ -14,6 +14,6 @@
 
 module Wildcloud
   module Keeper
-    VERSION = '0.0.2' unless const_defined?(:VERSION)
+    VERSION = '0.0.3' unless const_defined?(:VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcloud-keeper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2152643840 !ruby/object:Gem::Requirement
+  requirement: &2152690020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152643840
+  version_requirements: *2152690020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152643060 !ruby/object:Gem::Requirement
+  requirement: &2152688820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,21 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152643060
+  version_requirements: *2152688820
 - !ruby/object:Gem::Dependency
   name: wildcloud-logger
-  requirement: &2152642060 !ruby/object:Gem::Requirement
+  requirement: &2152687660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152687660
+- !ruby/object:Gem::Dependency
+  name: wildcloud-configuration
+  requirement: &2152685420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +54,7 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152642060
+  version_requirements: *2152685420
 description: Keeper deploys instances, starts and stops virtual machines
 email:
 - marek@jelen.biz