odania 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 715d1bf1052253129dbeb8261b4827e43c5c67c2
-  data.tar.gz: 17e9b820fbe61c229d6a271b7edb6dd3d080c0a8
+  metadata.gz: 8898e664723da738bf3af53220963892b7e8b74f
+  data.tar.gz: 4e0c261a541c640fd44d35b5a60687480730d7e5
 SHA512:
-  metadata.gz: 8a8c8c47742f5996a5329d447f3113d0e8822531ec3542b8cd461986377c299d678c117c5b6159f971ed0ebdf00105c2bb0c3992eee2ed77176a09d90015ed88
-  data.tar.gz: 9833d75a12e5cfaa069fecaa926a287e3c03ef0fcc44f3c56a8e634d9173c99e939dc6a94dfc18cac2d3a93d299efed8f34d36fac5e894bb0fd91b63030b7dd6
+  metadata.gz: defd5442812bbaa01255998e3a2fa67016993ca4b469064abc86ab80a225189f15cdee5a5b65cabf749d3ca0479f956447990f644f6f9c17bdc5056a11617f3c
+  data.tar.gz: d0099bad4b25775dc143f00d6690da05c354eecc73177661a9a2d48b112dd1660eb8c8736602f47307895c65ed4f23612765ed27d9b9b4ad3cd2d65e28c44fda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.4)
+    odania (0.0.5)
       diplomat
 
 GEM

data/lib/odania/plugin.rb

@@ -25,7 +25,8 @@ module Odania
 			puts "Writing plugin instance config: #{plugin_instance_name}"
 			Diplomat::Kv.put("#{get_plugin_path(plugin_name)}#{plugin_instance_name}", JSON.dump(plugin_config))
 
-			Odania.service.register_service(plugin_name, plugin_instance_name, plugin_config['ip'])
+			consul_config = Odania.service.consul_service_config(plugin_name, plugin_instance_name, plugin_config['ip'], plugin_config['tags'], plugin_config['port'])
+			Odania.service.register_service(consul_config)
 
 			Diplomat::Event.fire('updated_plugin_config', "#{plugin_name}|#{plugin_instance_name}")
 		end

data/lib/odania/service.rb

@@ -1,28 +1,25 @@
 module Odania
 	class Service < Odania::Consul
-		def register_service(plugin_name, plugin_instance_name, ip)
-			puts "Registering service #{plugin_name} as instance #{plugin_instance_name}"
-			if Diplomat::Service.register consul_service_config(plugin_name, plugin_instance_name, ip)
+		def register_service(consul_config)
+			if Diplomat::Service.register consul_config
 				puts 'Service registered'
 			else
 				puts 'Error registering service'
 			end
 		end
 
-		private
-
-		def consul_service_config(plugin_name, plugin_instance_name, ip)
+		def consul_service_config(plugin_name, plugin_instance_name, ip, tags=[], port=80)
 			{
 				'id' => plugin_instance_name,
 				'name' => plugin_name,
-				'tags' => ['odania-static'],
-				'port' => 80,
+				'tags' => tags,
+				'port' => port,
 				'token' => plugin_instance_name,
 				'checks' => [
 					{
 						'id' => plugin_name,
-						'name' => 'HTTP on port 80',
-						'http' => "http://#{ip}:80/health",
+						'name' => "HTTP on port #{port}",
+						'http' => "http://#{ip}:#{port}/health",
 						'interval' => '10s',
 						'timeout' => '1s'
 					}

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Petersen