cncflora_commons 0.0.27 → 0.0.28

data/lib/cncflora_commons.rb

@@ -73,128 +73,20 @@ def search(db,index,query)
     result
 end
 
-def flatten(obj)
-    flat = {}
-    if obj["dir"] && obj["nodes"] then
-        obj["nodes"].each { |n|
-            flat = flat.merge(flatten(n))
-        }
-    else
-        key = obj["key"].gsub("/","_").gsub("-","_")
-        flat[key[1..key.length].to_sym]=obj["value"]
-    end
-        flat
-end
-
-def etcd2config(server,prefix="")
-    config = flatten( http_get("#{server}/v2/keys/?recursive=true")["node"] )
-    config.keys.each {|k|
-        if k.to_s.end_with?("_url") then
-            config[k.to_s.gsub(prefix,"").gsub("_url","").to_sym] = config[k]
-        end
-    }
-    config
-end
-
 def setup(file)
     config_file file
 
-    if ENV["DB"] then
-        set :db, ENV["DB"]
-    end
-
-    if ENV["CONTEXT"] then
-        set :context, ENV["CONTEXT"]
-    else
-        set :context, "connect"
-    end
-
-    if ENV["PREFIX"] then
-        set :prefix, ENV["PREFIX"]
-    else
-        set :prefix, ""
-    end
-
-    if ENV["BASE"] then
-        set :base, ENV["BASE"]
-    else
-        set :base, ""
-    end
-
-    if settings.prefix.length >= 1 then
-        set :prefix, "#{settings.prefix}_"
-    end
-
-    if ENV["ETCD_PORT_4001_TCP_ADDR"] then
-        set :etcd, "http://#{ENV["ETCD_PORT_4001_TCP_ADDR"]}:#{ENV["ETCD_PORT_4001_TCP_PORT"]}"
-    elsif ENV["ETCD"] then
-        set :etcd, ENV["ETCD"]
-    elsif settings.etcd then
-    else
-        set :etcd, "http://localhost:4001"
-    end
-
-    @config = etcd2config(settings.etcd,settings.prefix)
-
-    onchange(settings.etcd,settings.prefix) do |newconfig|
-        @config = newconfig
-        setup! newconfig
-    end
+    ENV.each {|k,v| set k.to_sym, v}
 
     use Rack::Session::Pool
 
     set :session_secret, '1flora2'
     set :views, 'src/views'
 
-    setup! @config
-end
-
-def setup!(config)
-
     if settings.lang then
-        config[:strings] = JSON.parse(File.read("src/locales/#{settings.lang}.json", :encoding => "BINARY"))
-    end
-
-    if ENV["DATAHUB_PORT_8080_TCP_ADDR"] then
-        config[:datahub] = "http://#{ENV["DATAHUB_PORT_8080_TCP_ADDR"]}:#{ENV["DATAHUB_PORT_8080_TCP_PORT"]}"
-    end
-
-    if config.has_key? :elasticsearch then
-        config[:elasticsearch] = "#{config[:elasticsearch]}"
-    else
-        config[:elasticsearch] = "#{config[:datahub]}"
+        settings.strings = JSON.parse(File.read("src/locales/#{settings.lang}.json", :encoding => "BINARY"))
     end
 
-    if config.has_key? :couchdb then
-        config[:couchdb] = "#{config[:couchdb]}"
-    else
-        config[:couchdb] = "#{config[:datahub]}"
-    end
-
-    if settings.context then
-        config[:context] = settings.context
-    end
-
-    if settings.base then
-        config[:base] = settings.base
-    end
-
-    config.keys.each { |key| set key, config[key] }
-
-    set :config, config
-
     puts "Config loaded"
-    puts config
-
-    config
-end
-
-def onchange(etcd,prefix="")
-    Thread.new do
-        while true do
-            http_get("#{ etcd }/v2/keys/?recursive=true&wait=true")
-            yield etcd2config(etcd,prefix)
-        end
-    end
 end
 

metadata

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