cncflora_commons 0.0.34 → 0.0.35

data/lib/cncflora_commons.rb

@@ -79,6 +79,14 @@ def setup(file)
 
     @config = YAML.load_file(file)[ENV['RACK_ENV'] || 'development']
 
+    @config.each {|ck,cv|
+      ENV.each {|ek,ev|
+        if cv =~ /\$#{ek}/ then
+          @config[ck] = cv.gsub(/\$#{ek}/,ev)
+        end
+      }
+    }
+
     if @config["etcd"] || ENV["ETCD"] then
       etcd_cfg = etcd2config(@config["etcd"] || ENV["ETCD"])
       onchange(@config["etcd"] || ENV["ETCD"]) do |newconfig|
@@ -90,14 +98,6 @@ def setup(file)
       etcd_cfg.each {|k,v| @config[k] = v }
     end
 
-    @config.each {|ck,cv|
-      ENV.each {|ek,ev|
-        if cv =~ /\$#{ek}/ then
-          @config[ck] = cv.gsub(/\$#{ek}/,ev)
-        end
-      }
-    }
-
     ENV.each {|k,v| @config[k]=v }
 
     if @config["lang"] then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cncflora_commons
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
   prerelease: 
 platform: ruby
 authors: