Update code from https://github.com/dmi-try/marionette-collective

[packages/precise/mcollective.git] / lib / mcollective / config.rb

diff --git a/lib/mcollective/config.rb b/lib/mcollective/config.rb
index 8b5e4091ae8acd6efa9e57d399b6812e57597c3b..7ce3a26714cdf4fc6ed08c224532ed4a923ca30c 100644 (file)
--- a/lib/mcollective/config.rb
+++ b/lib/mcollective/config.rb
@@ -5,16 +5,16 @@ module MCollective
 
     attr_accessor :mode
 
-    attr_reader :topicprefix, :daemonize, :pluginconf, :libdir, :configured
+    attr_reader :daemonize, :pluginconf, :libdir, :configured
     attr_reader :logfile, :keeplogs, :max_log_size, :loglevel, :logfacility
     attr_reader :identity, :daemonize, :connector, :securityprovider, :factsource
-    attr_reader :registration, :registerinterval, :topicsep, :classesfile
+    attr_reader :registration, :registerinterval, :classesfile
     attr_reader :rpcauditprovider, :rpcaudit, :configdir, :rpcauthprovider
     attr_reader :rpcauthorization, :color, :configfile, :rpchelptemplate
     attr_reader :rpclimitmethod, :logger_type, :fact_cache_time, :collectives
     attr_reader :main_collective, :ssl_cipher, :registration_collective
     attr_reader :direct_addressing, :direct_addressing_threshold, :ttl, :helptemplatedir
-    attr_reader :queueprefix, :default_discovery_method, :default_discovery_options
+    attr_reader :default_discovery_method, :default_discovery_options
 
     def initialize
       @configured = false
@@ -24,7 +24,7 @@ module MCollective
       set_config_defaults(configfile)
 
       if File.exists?(configfile)
-        File.open(configfile, "r").each do |line|
+        File.readlines(configfile).each do |line|
 
           # strip blank spaces, tabs etc off the end of all lines
           line.gsub!(/\s*$/, "")
@@ -35,8 +35,6 @@ module MCollective
               val = $2
 
               case key
-                when "topicsep"
-                  @topicsep = val
                 when "registration"
                   @registration = val.capitalize
                 when "registration_collective"
@@ -47,10 +45,6 @@ module MCollective
                   @collectives = val.split(",").map {|c| c.strip}
                 when "main_collective"
                   @main_collective = val
-                when "topicprefix"
-                  @topicprefix = val
-                when "queueprefix"
-                  @queueprefix = val
                 when "logfile"
                   @logfile = val
                 when "keeplogs"
@@ -74,7 +68,7 @@ module MCollective
                 when "identity"
                   @identity = val
                 when "direct_addressing"
-                  val =~ /^1|y/i ? @direct_addressing = true : @direct_addressing = false
+                  @direct_addressing = false unless val =~ /^1|y/i
                 when "direct_addressing_threshold"
                   @direct_addressing_threshold = val.to_i
                 when "color"
@@ -124,6 +118,8 @@ module MCollective
           end
         end
 
+        raise('The %s config file does not specify a libdir setting, cannot continue' % configfile) if @libdir.empty?
+
         I18n.load_path = Dir[File.expand_path(File.join(File.dirname(__FILE__), "locales", "*.yml"))]
         I18n.locale = :en
 
@@ -163,9 +159,6 @@ module MCollective
       @registration = "Agentlist"
       @registerinterval = 0
       @registration_collective = nil
-      @topicsep = "."
-      @topicprefix = "/topic/"
-      @queueprefix = "/queue/"
       @classesfile = "/var/lib/puppet/state/classes.txt"
       @rpcaudit = false
       @rpcauditprovider = ""
@@ -185,7 +178,7 @@ module MCollective
       @collectives = ["mcollective"]
       @main_collective = @collectives.first
       @ssl_cipher = "aes-256-cbc"
-      @direct_addressing = false
+      @direct_addressing = true
       @direct_addressing_threshold = 10
       @default_discovery_method = "mc"
       @default_discovery_options = []