skalera-services 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb2ac00691e718c26fa79f2cc816a8eca2d46b0
-  data.tar.gz: 52fb334e538f3f2c4a452c9701b0045554757ecf
+  metadata.gz: 0274e8b794d6a41f2b67f9d71df9ccfca37e6d78
+  data.tar.gz: 9bfcbb458fb88f1cdd96d72b217e56556855dd5e
 SHA512:
-  metadata.gz: 4ef642048d4efabecb726fcb2846b92edcd380ae35148cba38db560d1222ecb61fa3644f4904b969298379c92621a31a7556944768234b50269ca66db621cc32
-  data.tar.gz: f829b3ce5e65aa8233b302f4087eee1f1c0c5242db016a70d4b9009009c25ad46bb3e59398b8e647fdbb9c313428645b84525f8856df5ffd458134e1b5a7f044
+  metadata.gz: 4c68bd0f591322fb5d4f2de9883793ebdd01a50c7044a7d82f590a6048c4cbbae036f6ebf05545bcf4c156b1d4d443cc8a63659f53af927d4b5563b4f42cde42
+  data.tar.gz: 04e8f56aac5a66b9c2127398f628464c93e810a6706cedd1da3f251d3427e8629877d5c98991f023184a9067f026f85f5d4717e43c6cd3f816ae9e0bc16a98f2

data/lib/skalera/services/influxdb.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'influxdb'
 
 module Skalera
@@ -5,15 +6,24 @@ module Skalera
     class InfluxDB
       SERVICE_NAME = 'influxdb-8086'
       def self.instance(database)
-        influxdb_config = Diplomat::Service.get(SERVICE_NAME)
+        url = ENV['SKALERA_INFLUXDB_URL']
+        if url
+          uri = URI(url)
+          host = uri.host
+          port = uri.port || '8086'
+          user = uri.user
+          password = uri.password
+        else
+          influxdb_config = Diplomat::Service.get(SERVICE_NAME)
+          host = influxdb_config.Address
+          port = influxdb_config.ServicePort
+          user = key('user')
+          password = key('password')
+        end
 
-        influxdb = ::InfluxDB::Client.new(database,
-                                          host: influxdb_config.Address,
-                                          port: influxdb_config.ServicePort,
-                                          user: key('user'),
-                                          password: key('password'))
-        # does not need an at_exit, as the influx clients takes care of it
-        influxdb
+        ::InfluxDB::Client.new(database, host: host, port: port, user: user, password: password)
+      rescue URI::InvalidURIError => e
+        STDERR.puts "ERROR: could not parse URL: #{e.message}"
       rescue Diplomat::KeyNotFound
         STDERR.puts "ERROR: service not found: #{SERVICE_NAME}"
       end

data/lib/skalera/services/postgres.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'sequel'
 
 module Skalera
@@ -5,12 +6,20 @@ module Skalera
     class Postgres
       SERVICE_NAME = 'postgres'
       def self.instance(database)
-        postgres_config = Diplomat::Service.get(SERVICE_NAME)
+        if ENV['SKALERA_DB_URL']
+          url = ENV['SKALERA_DB_URL']
+        else
+          postgres_config = Diplomat::Service.get(SERVICE_NAME)
 
-        host = postgres_config.Address
-        port = postgres_config.ServicePort
+          uri = URI('postgres:/')
+          uri.host = postgres_config.Address
+          uri.port = postgres_config.ServicePort
+          uri.user = key('user')
+          uri.password = key('password')
+          uri.path = "/#{database}"
+          url = uri.to_s
+        end
 
-        url = "postgres://#{key('user')}:#{key('password')}@#{host}:#{port}/#{database}"
         db = ::Sequel.connect(url)
         at_exit { db.disconnect }
         db

data/lib/skalera/services/redis.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'redis'
 
 module Skalera
@@ -5,20 +6,29 @@ module Skalera
     class Redis
       SERVICE_NAME = 'redis'
       def self.instance(database = 0)
-        redis_config = Diplomat::Service.get(SERVICE_NAME)
+        if ENV['SKALERA_REDIS_URL']
+          redis_url = ENV['SKALERA_REDIS_URL']
+        else
+          redis_config = Diplomat::Service.get(SERVICE_NAME)
+          uri = URI('redis:/')
+          uri.host = redis_config.Address
+          uri.port = redis_config.ServicePort
+          uri.path = "/#{database}"
+          if password
+            uri.user = 'redis' # this is not used, but URI require a user when you have a password
+            uri.password = password
+          end
 
-        redis = ::Redis.new(url: url(password, redis_config.Address, redis_config.ServicePort, database))
+          redis_url = uri.to_s
+        end
+
+        redis = ::Redis.new(url: redis_url)
         at_exit { redis.quit }
         redis
       rescue Diplomat::KeyNotFound
         STDERR.puts "ERROR: service not found: #{SERVICE_NAME}"
       end
 
-      def self.url(password, host, port, database)
-        pwd = password ? "#{password}:" : ''
-        "redis://#{pwd}#{host}:#{port}/#{database}"
-      end
-
       def self.password
         Diplomat.get('redis/password')
       rescue Diplomat::KeyNotFound

data/lib/skalera/services/version.rb

@@ -1,5 +1,5 @@
 module Skalera
   module Services
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skalera-services
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Martin Englund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake