odania 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d506a9221ab23566539c2d3c4ef05591c9c52708
-  data.tar.gz: a875aed746071e7c03818b937af551bd59eae577
+  metadata.gz: 7556edee100f621b9f326c7b21df1a33f9315beb
+  data.tar.gz: 73108f618ec93623d8b638443910eee6ed3a8ecb
 SHA512:
-  metadata.gz: c8808a430e8ace883a91f90fdb4300533b130e482ce1db76287966c9f5941ba8a97dc539e4364dd30422fe1d75b4764fc5605a43cc134dc47bf4b2598aa31155
-  data.tar.gz: 9ecdd650491184c8cb6ce4540c91c03c10b1c5ee5bca7fd1e87487501a3432c98b3460031cfd45228474f1670006d4ba8ad7060d6f0225981da1531c809d76c4
+  metadata.gz: a287b037fdc60d676f7f8030a05c275ba3ac7b08f86cf7f8a349f896eb695e8cb01c6a0f5f1a5a83186b82a159d7be9c72f5da9410c90cbc6cc8a1e6f295748d
+  data.tar.gz: 1418a94ca5a651178d94454bbf9b4c8f1f1a5b773b998757d68775669a7db4eb14f9f501322ebc790c04bfb827e99cfb78922262949adef1a07329f63dbe9a2e

data/Gemfile.lock

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

data/features/step_definitions/plugin_steps.rb

@@ -7,7 +7,7 @@ Given(/^I initialize the gem$/) do
 	Odania.plugin.get_all.each_pair do |name, instances|
 		instances.each do |instance|
 			if instance.ServiceName.start_with? 'test-plugin'
-				puts "Deregister: #{instance}" if $debug
+				$logger.info "Deregister: #{instance}" if $debug
 				Odania.plugin.deregister instance.ServiceID
 			end
 		end

data/lib/odania/config/global_config.rb

@@ -30,7 +30,7 @@ module Odania
 
 			def load_from_consul
 				Odania.plugin.get_all.each_pair do |plugin_name, instances|
-					puts "PLUGIN NAME #{plugin_name} - #{instances.count}" if $debug
+					$logger.info "PLUGIN NAME #{plugin_name} - #{instances.count}" if $debug
 					instances.each do |instance|
 						add_backend(instance)
 					end
@@ -42,27 +42,27 @@ module Odania
 						puts JSON.pretty_generate config if $debug
 						self.add_plugin_config(config)
 					rescue => e
-						puts 'Error loading configuration'
-						puts 'Config start ' + '+' * 50
+						$logger.error 'Error loading configuration'
+						$logger.error 'Config start ' + '+' * 50
 						puts JSON.pretty_generate config
-						puts 'Config end ' + '+' * 50
-						puts 'Error start ' + '+' * 50
-						puts e.inspect
-						puts 'Error end ' + '+' * 50
-						puts 'Error backtrace start ' + '+' * 50
+						$logger.error 'Config end ' + '+' * 50
+						$logger.error 'Error start ' + '+' * 50
+						$logger.error e.inspect
+						$logger.error 'Error end ' + '+' * 50
+						$logger.error 'Error backtrace start ' + '+' * 50
 						e.backtrace.each do |line|
-							puts line
+							$logger.error line
 						end
-						puts 'Error backtrace end ' + '+' * 50
+						$logger.error 'Error backtrace end ' + '+' * 50
 					end
 				end
 			end
 
 			def generate_global_config
-				puts 'Loading plugin configs from consul'
+				$logger.info 'Loading plugin configs from consul'
 				load_from_consul
 
-				puts 'Generating global config'
+				$logger.info 'Generating global config'
 				config = self.dump
 				puts JSON.pretty_generate config if $debug
 				Odania.plugin.set_global_config config
@@ -75,7 +75,7 @@ module Odania
 				group_name = plugin_cfg['plugin-config']['name']
 
 				if $debug
-					puts 'Loading configuration'
+					$logger.info 'Loading configuration'
 					puts JSON.pretty_generate plugin_cfg
 				end
 

data/lib/odania/config/page.rb

@@ -21,7 +21,7 @@ module Odania
 			end
 
 			def director
-				puts self.inspect if self.group_name.nil?
+				$logger.info self.inspect if self.group_name.nil?
 				"#{Odania.varnish_sanitize(self.group_name)}_director"
 			end
 		end

data/lib/odania/consul.rb

@@ -5,7 +5,7 @@ module Odania
 		def initialize(consul_url)
 			consul_url = ENV['CONSUL_ADDR'] if consul_url.nil?
 			consul_url = 'http://consul:8500' if consul_url.nil?
-			puts "Consul URL: #{consul_url}" if $debug
+			$logger.info "Consul URL: #{consul_url}" if $debug
 			Diplomat.configure do |config|
 				# Set up a custom Consul URL
 				config.url = consul_url
@@ -59,7 +59,7 @@ module Odania
 				Diplomat::Service.get_all.each_pair do |key, _value|
 					services[key.to_s] = get_all_for(key)
 				end
-				puts "SERVICES: #{JSON.pretty_generate services}" if $debug
+				$logger.info "SERVICES: #{JSON.pretty_generate services}" if $debug
 				services
 			end
 
@@ -78,9 +78,9 @@ module Odania
 
 			def register(consul_config)
 				if Diplomat::Service.register consul_config
-					puts 'Service registered' if $debug
+					$logger.info 'Service registered' if $debug
 				else
-					puts 'Error registering service' if $debug
+					$logger.error 'Error registering service'
 				end
 			end
 

data/lib/odania/varnish/generators/generate_backend_vcl.rb

@@ -6,6 +6,8 @@ module Odania
 			self.default_backend = default_backend
 			self.backend_groups = backend_groups
 			self.template = File.new("#{BASE_DIR}/templates/varnish/backend.vcl.erb").read
+
+			@backend_names = []
 		end
 
 		def core_backends
@@ -20,6 +22,21 @@ module Odania
 			core_backends
 		end
 
+		def backend_name_for(group_name, instance_name)
+			backend_name = "#{Odania.varnish_sanitize(group_name)}_#{Odania.varnish_sanitize(instance_name)}"
+			@backend_names << backend_name
+			backend_name
+		end
+
+		def backend_name_already_taken(group_name, instance_name)
+			backend_name = "#{Odania.varnish_sanitize(group_name)}_#{Odania.varnish_sanitize(instance_name)}"
+			if @backend_names.include? backend_name
+				$logger.error "The Backend #{backend_name} is already defined!"
+				return true
+			end
+			false
+		end
+
 		def render
 			Erubis::Eruby.new(self.template).result(binding)
 		end

data/lib/odania/varnish.rb

@@ -50,23 +50,23 @@ module Odania
 			gen.write(out_dir)
 
 			puts
-			puts 'Registering internal varnish plugin'
+			$logger.info 'Registering internal varnish plugin'
 			register_plugin
 		end
 
 		def reload_config
-			puts 'Updating varnish config'
+			$logger.info '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}`
+			$logger.info "CMD: #{cmd}"
+			$logger.info `#{cmd}`
 			cmd = "varnishadm vcl.use reload#{current_number}"
-			puts "CMD: #{cmd}"
-			puts `#{cmd}`
+			$logger.info "CMD: #{cmd}"
+			$logger.info `#{cmd}`
 		end
 
 		private

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

data/lib/odania.rb

@@ -7,10 +7,12 @@ require 'public_suffix'
 require 'deep_merge'
 require 'json'
 require 'socket'
+require 'logger'
 
 BASE_DIR = File.absolute_path File.join File.dirname(__FILE__), '..'
 ENVIRONMENT = ENV['ENVIRONMENT'].nil? ? 'development' : ENV['ENVIRONMENT']
 LOCAL_TEST_MODE = 'development'.eql?(ENVIRONMENT) unless defined? LOCAL_TEST_MODE
+$logger = Logger.new(STDOUT)
 
 module Odania
 	CORE_PLUGIN_NAME = 'odania-core'

data/templates/varnish/backend.vcl.erb

@@ -25,12 +25,14 @@ backend default {
 
 <% backend_groups.each_pair do |group_name, backend_group| %>
 	<% backend_group.backends.each do |backend| %>
+		<% unless backend_name_already_taken(group_name, backend.instance_name) %>
 
-		backend <%= Odania.varnish_sanitize(group_name) %>_<%= Odania.varnish_sanitize(backend.instance_name) %> {
+		backend <%= backend_name_for(group_name, backend.instance_name) %> {
 			.host = "<%= backend.host %>";
 			.port = "<%= backend.port %>";
 			.probe = www_probe;
 		}
+		<% end %>
 	<% end %>
 <% end %>
 

metadata

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