You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.7 KiB
42 lines
1.7 KiB
9 years ago
|
Index: boto-2.40.0/boto/route53/healthcheck.py
|
||
|
|
===================================================================
|
||
|
|
--- boto-2.40.0.orig/boto/route53/healthcheck.py
|
||
|
|
+++ boto-2.40.0/boto/route53/healthcheck.py
|
||
|
|
@@ -56,7 +56,7 @@ class HealthCheck(object):
|
||
|
|
%(ip_addr_part)s
|
||
|
|
<Port>%(port)s</Port>
|
||
|
|
<Type>%(type)s</Type>
|
||
|
|
- <ResourcePath>%(resource_path)s</ResourcePath>
|
||
|
|
+ %(resource_path)s
|
||
|
|
%(fqdn_part)s
|
||
|
|
%(string_match_part)s
|
||
|
|
%(request_interval)s
|
||
|
|
@@ -72,6 +72,8 @@ class HealthCheck(object):
|
||
|
|
|
||
|
|
XMLRequestIntervalPart = """<RequestInterval>%(request_interval)d</RequestInterval>"""
|
||
|
|
|
||
|
|
+ XMLResourcePath = """<ResourcePath>%(resource_path)s</ResourcePath>"""
|
||
|
|
+
|
||
|
|
valid_request_intervals = (10, 30)
|
||
|
|
|
||
|
|
def __init__(self, ip_addr, port, hc_type, resource_path, fqdn=None, string_match=None, request_interval=30, failure_threshold=3):
|
||
|
|
@@ -127,7 +129,7 @@ class HealthCheck(object):
|
||
|
|
'ip_addr_part': '',
|
||
|
|
'port': self.port,
|
||
|
|
'type': self.hc_type,
|
||
|
|
- 'resource_path': self.resource_path,
|
||
|
|
+ 'resource_path': "",
|
||
|
|
'fqdn_part': "",
|
||
|
|
'string_match_part': "",
|
||
|
|
'request_interval': (self.XMLRequestIntervalPart %
|
||
|
|
@@ -140,6 +142,9 @@ class HealthCheck(object):
|
||
|
|
if self.ip_addr:
|
||
|
|
params['ip_addr_part'] = self.XMLIpAddrPart % {'ip_addr': self.ip_addr}
|
||
|
|
|
||
|
|
+ if self.resource_path is not None:
|
||
|
|
+ params['resource_path'] = self.XMLResourcePath % {'resource_path': self.resource_path}
|
||
|
|
+
|
||
|
|
if self.string_match is not None:
|
||
|
|
params['string_match_part'] = self.XMLStringMatchPart % {'string_match': self.string_match}
|
||
|
|
|