dendrite 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf966fd074a2bd72ee771148bd063bc0b6c4453
-  data.tar.gz: d339540dbaf44899ce66d1b838248695fac5c381
+  metadata.gz: 07a06a3923e7f4cc89718437418b5508a244fcbd
+  data.tar.gz: ac5def8a17722a49325f146d4770ff521439eade
 SHA512:
-  metadata.gz: 811afd7bd3555901660d6738cc4297381601275077b35b02d7c04777fe6de7f34c5381617a6ceec9b3a4f44425b4d16cf88f9f34257cabf9a567bc6a11f097c3
-  data.tar.gz: 0bf4f9179a3049136e0e30fdccef4cf572780c0bca2364d862584fba330f3645dc3a87636855d03d0f27b85308ca39f56220659227ccac4f8dfacabc56b612fe
+  metadata.gz: f56848a85c2ffee5cfff15c1354a98f4856c60e5a206ee18560f7c3a05d11b48627aa78c5c4196cf5adea2f25d60a7aeb06ed5eeda5af239fe094a4730c9eca1
+  data.tar.gz: 4813a8ffacabceeff15c27e6fb5e88c59c36a9572cb9bf5eeaf6fe18c3ea4757c9ea3fce6a8b0896fe8611e8874b43ebbd31c5bbce2d9725f0c824af5a8e8f3c

data/conf/config.yml

@@ -4,6 +4,8 @@ dendrite:
   env: dev
   zk_hosts:
     - localhost:2181
+  bind_to_all: true
+  sticky: true
   nerve_config_path: /opt/smartstack/conf/nerve.yml
   synapse_config_path: /opt/smartstack/conf/synapse.yml
   services_source: conf/services
@@ -14,6 +16,8 @@ dendrite:
     - aerospike
     - cassandra
     - jar
+  http_app_types:
+    - tomcat
 
 synapse:
   server_options: check inter 2s rise 3 fall 2
@@ -47,7 +51,7 @@ synapse:
     - balance  roundrobin
     extra_sections:
       peers syncinghaproxy:
-      - peer haproxy1 192.168.0.1:1024
+      - peer foobar 0.0.0.0:1024
       listen stats :9999:
       - mode http
       - stats enable

data/conf/services/service.yml

@@ -29,10 +29,10 @@ subcomponents:
       - domain_name: foobar2.com
         environment: prd
     default_servers:
-      - host: 192.168.1.1
+      - host: 0.0.0.0
         port: 8080
         environment: stg
-      - host: 192.168.1.2
+      - host: 0.0.0.0
         port: 8080
         environment: prd
     dependencies:
@@ -48,7 +48,7 @@ subcomponents:
       foo: bar
       sticky_session: sessionkey
   - name: cat
-    type: tomcat
+    type: mysql
     deploy:
       repository: git@github.com:yagnik/dendrite
       package: dendrite

data/lib/dendrite.rb

@@ -72,6 +72,18 @@ module Dendrite
         @@data[:dendrite][:valid_app_types]
       end
 
+      def http_types
+        @@data[:dendrite][:http_app_types] || []
+      end
+
+      def cookie
+        @@data[:dendrite][:cookie] || "COOKME"
+      end
+
+      def sticky
+        @@data[:dendrite][:sticky]
+      end
+
       def bind_to_all?
         @@data[:dendrite][:bind_to_all] != nil
       end

data/lib/dendrite/generators/synapse.rb

@@ -85,7 +85,8 @@ module Dendrite
               bind_address: bind_address,
               server_options: Dendrite::Config.server_options,
               listen: mode,
-              backend_order: metadata && metadata.sticky_session ? 'asc' : nil
+              cookie_value_method: 'hash',
+              backend_order: (metadata && metadata.sticky_session) || Dendrite::Config.sticky ? 'asc' : nil
             }
           }
 
@@ -99,16 +100,17 @@ module Dendrite
         end
 
         def mode
-          if metadata && metadata.sticky_session
+          if Dendrite::Config.http_types.include?(service.type)
+            arr = ['mode http']
+            key = metadata && metadata.sticky_session ? metadata.sticky_session : Dendrite::Config.cookie
             peer = Dendrite::Config.peer ? " peers #{Dendrite::Config.peer}": ''
-            [
-              'mode http',
-              "stick-table type string len 200 size 500m expire 30m#{peer}",
-              "stick store-response res.cook(#{metadata.sticky_session})",
-              "stick match req.cook(#{metadata.sticky_session})"
-            ]
-          elsif domain_names[environment] && domain_names[environment].length > 0
-            ['mode http']
+
+            arr << "cookie #{Dendrite::Config.cookie} insert nocache"
+            arr << "stick-table type string len 200 size 500m expire 30m#{peer}"
+            arr << "stick store-response res.cook(#{key})"
+            arr << "stick match req.cook(#{key})"
+
+            arr
           else
             ['mode tcp']
           end

data/lib/dendrite/service_node.rb

@@ -63,6 +63,7 @@ module Dendrite
       validates_presence_of :host
       validates_presence_of :port
       validates :port, numericality: { only_integer: true }
+      validates_inclusion_of :port, :in => 1..65535
     end
 
     DomainName = Struct.new(:environment, :domain_name) do
@@ -83,6 +84,7 @@ module Dendrite
       validates_presence_of :name
       validates_presence_of :port
       validates :port, numericality: { only_integer: true }
+      validates_inclusion_of :port, :in => 1..65535
     end
 
     Dependency = Struct.new(:service, :latency, :identifier) do

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler