doorkeepr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0bd2f5550e8cf00fe4a3a5f325e4526999cefa0
-  data.tar.gz: f4dacfc22262e372fa2ad3683ced5e4aaba70fb1
+  metadata.gz: c5254314c92311ba0bc90fbde82759f6c685e31a
+  data.tar.gz: 97412783a1dae4811e92b08c2b64fc485433d251
 SHA512:
-  metadata.gz: 64a0f3f59a8f8efb7b297f6e4bbb152fff68850997a82a8928e3db4fd64b7ad13e3ed3903e74f1db5a8cb41a9ebcec18bde7f20c5bf144581cca67eb9e9d56d2
-  data.tar.gz: 5a88826c1bced56f66a429e1775623a295e3d4fc1d13c387a356f2309eaa34cbf117d70de9de309214a4ed52a5f6f75c3d5b33fabcbb60e376c524c283d4fea1
+  metadata.gz: 608b7dd7fa6c686d29cd85c2c890aedbed67c6245895defaff48c7fbe3b79f22066bd0b78e01ffef941bb283e72cc861906b44e2c2ba82bf1124f9af4faaa70f
+  data.tar.gz: fde9ebbd151d3988dd45f6f75052fc9eff73b3fa2400f5960201097a1aabee991671923963a81b369dc4d29ebf6c5c54f7ae56e3867dd062eb9ebb58fd3dc0cb

data/lib/doorkeepr.rb

@@ -10,6 +10,9 @@ module Doorkeepr
     def publish
       Doorkeepr::Nerve.publish if defined? ::Rails::Server
     end
+    def paths
+      @paths ||= []
+    end
   end
 end
 

data/lib/doorkeepr/config.rb

@@ -1,12 +1,16 @@
 module Doorkeepr
   class Config < OpenStruct
     def initialize params={}
-      params[:host]     = ::Rails::Server.new.options[:Host] if defined? ::Rails::Server
-      params[:host]   ||= "localhost"
-      params[:port]     = ::Rails::Server.new.options[:Port] if defined? ::Rails::Server
-      params[:port]   ||= 3000
-      params[:url]      = ::Rails.application.class.parent_name.underscore.gsub(/_/,"-").sub(/$/,".dev")
-      params[:url]    ||= "rails.dev"
+      params[:host]          = ::Rails::Server.new.options[:Host] if defined? ::Rails::Server
+      params[:host]          = "localhost" if params[:host] ==  "0.0.0.0"
+      params[:host]        ||= "localhost"
+      params[:port]          = ::Rails::Server.new.options[:Port] if defined? ::Rails::Server
+      params[:port]        ||= 3000
+      params[:url]           = ::Rails.application.class.parent_name.underscore.gsub(/_/,"-").sub(/$/,".dev")
+      params[:url]         ||= "rails.dev"
+      params[:customer]    ||= `whoami`.strip
+      params[:application] ||= params[:url]
+      params[:service]     ||= "rails"
       super params
     end
     def to_json

data/lib/doorkeepr/nerve.rb

@@ -5,49 +5,56 @@ module Doorkeepr
     class << self
       def publish
         puts "Publishing Server with #{Doorkeepr.config.inspect}"
-        @nerve_instance = ::Nerve::Nerve.new config
+        ap config
+        @doorkeepr = ::Nerve::Nerve.new config
         marshal
         at_exit do
-          @nerve.kill
+          @threads.each{|t|t.kill}
         end
       end
-      def nerve_instance
-        @nerve_instance
+      def doorkeepr
+        @doorkeepr
+      end
+      def nerve
       end
       def marshal
         puts 'Doorkeepr: publish!'
-        @nerve = Thread.new do
-          nerve_instance.run          
-        end
+        @threads ||= []
+        @threads << Thread.new { doorkeepr.run }
+      end
+      def service uri="/doorkeepr",path:doorkeepr_path
+        {
+          host: host,
+          port: port,
+          reporter_type: "zookeeper",
+          zk_hosts: zk_hosts,
+          zk_path:  path,
+          check_interval: 5,
+          checks:   [{timeout:0.2,rise:2,fall:3,type:"http",uri:uri}]
+        }
+      end
+      def additional_paths
+        paths   = Doorkeepr.paths
+        paths ||= []
+        paths.collect do |path|
+          [
+            Digest::MD5.hexdigest(path),
+            service(uri,path:path)
+          ]
+        end.to_h
       end
       def config
         {
           instance_id: instance_id,
           services: {
-            application => {
-              host: host,
-              port: port,
-              reporter_type: "zookeeper",
-              zk_hosts: zk_hosts,
-              zk_path:  doorkeepr_path,
-              check_interval: 5,
-              checks:   [{timeout:0.2,rise:2,fall:3,type:"http",uri:"/doorkeepr"}]
-            },
-            "uplink" => {
-              host: host,
-              port: port,
-              reporter_type: "zookeeper",
-              zk_hosts: zk_hosts,
-              zk_path:  uplink_path,
-              check_interval: 5,
-              checks:   [{timeout:0.2,rise:2,fall:3,type:"http",uri:uri}]
-            }
-          }
+            application => service,
+            "uplink" => service(uri,path:uplink_path)
+          }.merge(additional_paths)
         }.with_indifferent_access
       end
       def uplink_path
         @uplink_path   = Doorkeepr.config.uplink
-        @uplink_path ||= "/nerve/global/#{Doorkeepr.config.url}/rails/services"
+        @uplink_path ||= "/nerve/#{Doorkeepr.config.customer}/#{Doorkeepr.config.application}/#{Doorkeepr.config.service}/services"
       end
       def doorkeepr_path
         @doorkeepr_path   = Doorkeepr.config.path

data/lib/doorkeepr/version.rb

@@ -1,3 +1,3 @@
 module Doorkeepr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeepr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails