odania 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b671c7072f85953afe30ec8589a8f984cc8a8183
-  data.tar.gz: e704fd38e458253a9608c2766100891df7c78336
+  metadata.gz: b9ffca23df7f0bcf704ee4dfeb787327b6d22513
+  data.tar.gz: 1c5ad5ec6aad793ca550ffc6d46ca6f22b8d7aa9
 SHA512:
-  metadata.gz: 3a6bd18be224b93924931348883e82bb4a7775359cd210dfab21b1b61dcfbd5f6be0fadccbdab87c609ad65a111e87084c74485fa980457b62cae14988dba64b
-  data.tar.gz: 1228bdbf0dfc98098ecf36dc071fb612a93226ab19b2aa162709a1f2981cb1ef1c3b06dd627455e0ad3cb13ef1c513df92b00e552a4da09af4e57da1ec28d858
+  metadata.gz: 131db8a62b7dea4c0a3536e9058806b0bec5a1fc94c7241d1a33dc3d1c7574b328ef2700a57ff0e2ce1688d4808a8539c5b9755848ef936b9b6135ffd774c653
+  data.tar.gz: 491ea63fd9f1c76befb728d332ef9863dbe95da956f7586c6f6df314f52faabc62b7a2cb2572c472c35403b6d977693b63177a5154cee4421fa7533e4bfb005c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.21)
+    odania (0.0.22)
       deep_merge
       diplomat
       erubis

data/lib/odania/plugin.rb

@@ -36,16 +36,7 @@ module Odania
 
 		# Generate a unique number for this instance of the plugin
 		def get_plugin_instance_name(plugin_name)
-			plugin_instance_name_file = "#{INSTANCE_FILES_PATH}#{plugin_name}"
-
-			plugin_instance_name = nil
-			plugin_instance_name = File.read plugin_instance_name_file if File.exist? plugin_instance_name_file
-			return plugin_instance_name unless plugin_instance_name.nil?
-
-			available_instances = @consul.service.get_all_for plugin_name
-			plugin_instance_name = "#{plugin_name}_#{available_instances.length + 1}"
-			File.write plugin_instance_name_file, plugin_instance_name
-			plugin_instance_name
+			"#{plugin_name}_#{Socket.gethostname.gsub(/[^0-9a-zA-Z_]/, '_')}"
 		end
 
 		def plugin_config

data/lib/odania/varnish.rb

@@ -54,20 +54,20 @@ module Odania
 			register_plugin
 		end
 
-		 def reload_config
-			 puts 'Updating varnish config'
-			 current_number = 0
-			 current_number = File.read('/tmp/current_varnish_config_number').to_i if File.exist? '/tmp/current_varnish_config_number'
-			 current_number += 1
-			 File.write '/tmp/current_varnish_config_number', current_number
-
-			 cmd = "varnishadm vcl.load reload#{current_number} /etc/varnish/default.vcl"
-			 puts "CMD: #{cmd}"
-			 puts `#{cmd}`
-			 cmd = "varnishadm vcl.use reload#{current_number}"
-			 puts "CMD: #{cmd}"
-			 puts `#{cmd}`
-		 end
+		def reload_config
+			puts 'Updating varnish config'
+			current_number = 0
+			current_number = File.read('/tmp/current_varnish_config_number').to_i if File.exist? '/tmp/current_varnish_config_number'
+			current_number += 1
+			File.write '/tmp/current_varnish_config_number', current_number
+
+			cmd = "varnishadm vcl.load reload#{current_number} /etc/varnish/default.vcl"
+			puts "CMD: #{cmd}"
+			puts `#{cmd}`
+			cmd = "varnishadm vcl.use reload#{current_number}"
+			puts "CMD: #{cmd}"
+			puts `#{cmd}`
+		end
 
 		private
 

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler