synapse-easy 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34312d9b07a04714706e2df016c4f0b77d698a6
-  data.tar.gz: da4b8961fdb2f133d6bb33103a0b6e0d629b6137
+  metadata.gz: 7c8961a6aaaf5f5a1097995faad093746e0c8296
+  data.tar.gz: 72a1da2617782d24d3a55e2e13a6111a8f9fd7b3
 SHA512:
-  metadata.gz: 5c6d5321e068b099fa50a622c9a1ce3a44359c0651c7f1e74caff00e63a62c851a9aecb3eba60d855bde07677587c3d8c1edadb58c55444499aea180478c49be
-  data.tar.gz: a36ff952f0671a07bbc119aa0d9dd98003ef1f06c4c2d3c2b32c35834fede82481da5c4bdf4476948428540ad803e273d89d61681b60879b32f767f0ccac6da6
+  metadata.gz: d52cc731e18617759c1e833c8d7d7c9c12fd129fd9309543af62c2989a6c260a1c7f2bf70a225439628db843a91333914da64d9b6b319c9fca2679e8ac7167a8
+  data.tar.gz: 5b9b03ddf7efa65b1979ef064fcb10cdb7c0ac398776a9bfbe4e37289c2349001567d1d0addadf1af6c72fa4247591c165a2dbf34e2316b240442373025bbe09

data/lib/synapse/easy.rb

@@ -1,3 +1,5 @@
 require "synapse/easy/version"
 require "synapse/easy/service"
-require "synapse/easy/haproxy"
+require "synapse/easy/haproxy"
+require "synapse/easy/stats_section"
+require "synapse/easy/frontend_section"

data/lib/synapse/easy/extra_section.rb

@@ -0,0 +1,32 @@
+require "pathname"
+require "active_support/core_ext/hash/indifferent_access"
+require "fake/hash"
+
+module Synapse
+  module Easy
+    class ExtraSection
+      include Fake::Hash
+      attr_accessor :name, :type, :options
+      def initialize params={}
+        @name      = params[:name]
+        @type      = params[:type]
+        @type    ||= "frontend"
+        @options ||= []
+      end
+      def label
+        "#{type} #{name}"
+      end
+      def section_options
+        options
+      end
+      def each *args, &block
+        section_options.each(*args,&block)
+      end
+      def to_synapse
+        {
+          label => section_options
+        }
+      end
+    end
+  end
+end

data/lib/synapse/easy/frontend_section.rb

@@ -0,0 +1,13 @@
+require "synapse/easy/extra_section"
+
+module Synapse
+  module Easy
+    class FrontendSection < ExtraSection
+      attr_accessor :name, :type, :options
+      def initialize params={}
+        super
+        @type      = "frontend"
+      end
+    end
+  end
+end

data/lib/synapse/easy/haproxy.rb

@@ -8,17 +8,12 @@ module Synapse
   module Easy
     class Haproxy
       include Fake::Hash
-      class << self
-        def instance_id size=3
-          @instance_id ||= SecureRandom.hex(size)
-        end
-      end
       attr_accessor :reload_command, :do_writes, :do_reloads, :do_socket,
                     :frontends, :socket_file_path, :config_file_path,
                     :pid_file_path, :global_maxconn, :default_maxconn, :nbproc,
                     :default_log, :global_log_server, :global_log_level,
                     :default_retries, :default_log,:default_options,
-                    :default_balance, :default_timeouts
+                    :default_balance, :default_timeouts, :extra_sections
       attr_reader   :defaults, :global, :workdir
       def initialize params={}
         @do_writes         ||= true
@@ -52,8 +47,8 @@ module Synapse
           "server"  => 60,
         }
       end
-      def instance_id
-        self.class.instance_id
+      def instance_id size=3
+        @instance_id ||= SecureRandom.hex(size)
       end
       def workdir= workdir
         @workdir   = workdir if workdir.is_a? Pathname

data/lib/synapse/easy/service.rb

@@ -10,13 +10,15 @@ module Synapse
       attr_accessor :port, :mode, :uri, :inter, :rise, :fall, :method, :path,
                     :hosts, :registry, :customer, :application, :function,
                     :extension, :name, :leader_election, :keep_default_servers,
-                    :active
+                    :active, :enable_backend, :enable_frontend
       attr_reader   :default_servers
       def initialize params={}
         @default_servers ||= []
         @discovery       ||= {}
         @haproxy         ||= {}
+        @port              = params[:port]
         @port            ||= Freeport.port
+        @hosts             = params[:hosts]
         @hosts           ||= Resolv::Consul.services(:zookeeper).collect{|x|"#{x.address}:#{x.port}"}
         @mode              = params[:mode]
         @mode            ||= :tcp
@@ -44,6 +46,8 @@ module Synapse
         @name              = params[:name]
         @name            ||= [@customer,@application,@function].join("_")
         @active          ||= false
+        @enable_frontend   = params[:enable_frontend]
+        @enable_frontend ||= true if @enable_frontend.nil?
       end
       def add_default_server name, port
         @default_servers << "#{name}:#{port}"
@@ -75,11 +79,11 @@ module Synapse
         }.with_indifferent_access
       end
       def haproxy
-        {
-          port: port,
-          listen: listen,
-          server_options: server_options,
-        }.with_indifferent_access
+        result = {}.with_indifferent_access
+        result[:port] = port if enable_frontend
+        result[:listen] = listen
+        result[:server_options] = server_options
+        result
       end
       def server_options
         "check inter #{inter} rise #{rise} fall #{fall}" if [inter,rise,fall].compact.size == 3
@@ -94,7 +98,7 @@ module Synapse
         return application => {
           default_servers:default_servers,
           discovery: discovery,
-          haproxy: haproxy
+          haproxy:   haproxy
         }
       end
       def address

data/lib/synapse/easy/stats_section.rb

@@ -0,0 +1,56 @@
+require "synapse/easy/extra_section"
+require "socket"
+require "freeport"
+
+module Synapse
+  module Easy
+    class StatsSection < ExtraSection
+      attr_accessor :address, :port, :uri, :enabled, :refresh, :realm,
+                    :hide_version, :username, :password, :scope, :show_node,
+                    :node
+      def initialize params={}
+        super
+        @address        = params[:address]
+        @address      ||= "localhost"
+        @port           = params[:port]
+        @port         ||= Freeport.port
+        @uri            = params[:uri]
+        @uri          ||= "/"
+        @enabled        = params[:enabled]
+        @enabled      ||= true if @enabled.nil?
+        @refresh        = params[:refresh]
+        @refresh      ||= 5
+        @realm          = params[:realm]
+        @realm        ||= "HAProxy\\ Stats"
+        @hide_version   = params[:hide_version]
+        @hide_version ||= true if @hide_version.nil?
+        @username       = params[:username]
+        @password       = params[:password]
+        @scope          = params[:scope]
+        @show_node      = params[:show_node]
+        @show_node    ||= false if @show_node.nil?
+        @node           = params[:node]
+        @node         ||= Socket.gethostname
+      end
+      def section_options
+        @options + [
+            "mode http",
+          ( "stats enable" if enabled ),
+            "stats uri #{uri}",
+            "stats refresh #{refresh}",
+            "stats realm #{realm}",
+          ( "stats hide-version" if hide_version),
+          ( "stats auth #{username}:#{password}" if username and password ),
+          ( "stats scope #{scope}" if scope ),
+          ( "stats show-node #{node}" if show_node ),
+        ].compact
+      end
+      def bind
+        [address,port].compact.join(":")
+      end
+      def label
+        "listen stats #{bind}"
+      end
+    end
+  end
+end

data/lib/synapse/easy/version.rb

@@ -1,5 +1,5 @@
 module Synapse
   module Easy
-    VERSION = "0.1.4"
+    VERSION = "0.1.9"
   end
 end

data/synapse-easy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "synapse-config", "~> 0.1"
+  # spec.add_dependency "synapse-config", "~> 0.1"
   spec.add_dependency "resolv-consul", "~> 0.1"
   spec.add_dependency "freeport", "~> 0.1"
   spec.add_dependency "fake-hash", "~> 0.1"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: synapse-easy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: synapse-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: resolv-consul
   requirement: !ruby/object:Gem::Requirement
@@ -109,8 +95,11 @@ files:
 - bin/console
 - bin/setup
 - lib/synapse/easy.rb
+- lib/synapse/easy/extra_section.rb
+- lib/synapse/easy/frontend_section.rb
 - lib/synapse/easy/haproxy.rb
 - lib/synapse/easy/service.rb
+- lib/synapse/easy/stats_section.rb
 - lib/synapse/easy/version.rb
 - synapse-easy.gemspec
 homepage: http://synapse.stei.gr/easy