Commit cf0991c8 authored by Gabriel Monnerat's avatar Gabriel Monnerat

refactor code to use regex. The regex is used to get the host and port from url

parent eaca6fe6
...@@ -32,6 +32,7 @@ import sys ...@@ -32,6 +32,7 @@ import sys
import zc.buildout import zc.buildout
import zc.recipe.egg import zc.recipe.egg
import ConfigParser import ConfigParser
import re
class Recipe(BaseSlapRecipe): class Recipe(BaseSlapRecipe):
...@@ -75,26 +76,26 @@ class Recipe(BaseSlapRecipe): ...@@ -75,26 +76,26 @@ class Recipe(BaseSlapRecipe):
continue continue
rewrite_rule_list.append("%s %s" % (reference.replace("-", ""), url)) rewrite_rule_list.append("%s %s" % (reference.replace("-", ""), url))
slave_dict[reference] = "%s%s" % (base_url, reference.replace("-", "")) slave_dict[reference] = "%s%s" % (base_url, reference.replace("-", ""))
if 0:
# XXX To be finished by Gabriel bellow
#if slave_instance.get("enable_cache") == 1:
enable_cache = slave_instance.get("enable_cache", "")
if enable_cache.upper() in ('1', 'TRUE'):
# Varnish should use stunnel to connect to the backend # Varnish should use stunnel to connect to the backend
base_varnish_control_port = base_varnish_port + 1 base_varnish_control_port = base_varnish_port + 1
base_varnish_port += 2 base_varnish_port += 2
# Use regex # Use regex
slave_host = url.split("://")[1].split(":")[0].split("/")[0] host_regex = "((\[\w*|[0-9]+\.)(\:|)).*(\]|\.[0-9])"
slave_port = url.split("://")[1].split(":") slave_host = re.search(host_regex, url).group(0)
if len(slave_port) > 1: port_regex = "\w+(\/|)$"
slave_port = slave_port[0].split("/")[0] matcher = re.search(port_regex, url)
if matcher is not None:
slave_port = matcher.group(0)
slave_port = slave_port.replace("/", "")
elif url.startswith("https://"): elif url.startswith("https://"):
slave_port = 443 slave_port = 443
else: else:
slave_port = 80 slave_port = 80
self.installVarnishCache(name="varnish",
self.installVarnishCache(name=id,
ip=self.getLocalIPv4Address(), ip=self.getLocalIPv4Address(),
port=base_varnish_port, port=base_varnish_port,
control_port=base_varnish_control_port, control_port=base_varnish_control_port,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment