Merge branch 'staging'

Author: tifayuki

README.md

@@ -6,8 +6,7 @@ reconfigures itself when a linked cluster member redeploys, joins or leaves.
 
 ## Version
 
-- latest: `dockercloud/haproxy:1.2`
-- stable: `dockercloud/haproxy:1.1.1`
+- latest: `dockercloud/haproxy:1.2.1`
 
 **Attention** : Please *ALWAYS* use a specific image tag that works for you. Do *NOT* use `dockercloud/haproxy:latest` in any situation other than testing purpose.
 

haproxy/__init__.py

@@ -1 +1 @@
-__version__ = "1.2"
+__version__ = "1.2.1"

haproxy/haproxycfg.py

@@ -244,7 +244,9 @@ def get_tcp_section(self, details, services_aliases, tcp_port):
         tcp_section = []
         enable_ssl, port_num = TcpHelper.parse_port_string(tcp_port, self.ssl_bind_string)
         bind_string = get_bind_string(enable_ssl, port_num, self.ssl_bind_string, EXTRA_BIND_SETTINGS)
-        tcp_routes, self.routes_added = TcpHelper.get_tcp_routes(details, self.specs.get_routes(), tcp_port, port_num)
+        tcp_routes, routes_added = TcpHelper.get_tcp_routes(details, self.specs.get_routes(), tcp_port, port_num)
+        if routes_added not in self.routes_added:
+            self.routes_added.extend(routes_added)
         services = TcpHelper.get_service_aliases_given_tcp_port(details, services_aliases, tcp_port)
         balance = TcpHelper.get_tcp_balance(details)
         options = TcpHelper.get_tcp_options(details, services)

haproxy/parser/new_link_parser.py

@@ -61,4 +61,4 @@ def parse(self, service, key, value):
         if service in self.service_aliases:
             for attr in self.attrs:
                 if key == attr and not self.details[service][key]:
-                    self.details[service][key] = value
+                    self.details[service][key] = getattr(self, "parse_%s" % key)(value)