From 45e6025bcea493cbaf83b1b9c37e71dad84efa12 Mon Sep 17 00:00:00 2001 From: Vance Li Date: Wed, 15 Aug 2018 19:51:39 +0800 Subject: [PATCH 1/3] fix --- consul/base.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/consul/base.py b/consul/base.py index 0c86d406..ede33580 100755 --- a/consul/base.py +++ b/consul/base.py @@ -896,14 +896,19 @@ def register( params=params, data=json.dumps(payload)) - def deregister(self, service_id): + def deregister(self, service_id,token=None): """ Used to remove a service from the local agent. The agent will take care of deregistering the service with the Catalog. If there is an associated check, that is also deregistered. """ + params = [] + token = token or self.agent.token + if token: + params.append(("token",token)) return self.agent.http.put( - CB.bool(), '/v1/agent/service/deregister/%s' % service_id) + CB.bool(), '/v1/agent/service/deregister/%s' % service_id, + params=params) def maintenance(self, service_id, enable, reason=None): """ @@ -1011,13 +1016,19 @@ def register( params=params, data=json.dumps(payload)) - def deregister(self, check_id): + def deregister(self, check_id,token=None): """ Remove a check from the local agent. """ + params = [] + token = token or token = self.agent.token + if token: + params.append(("token",token)) + return self.agent.http.put( CB.bool(), - '/v1/agent/check/deregister/%s' % check_id) + '/v1/agent/check/deregister/%s' % check_id, + params=params) def ttl_pass(self, check_id, notes=None): """ @@ -1180,6 +1191,7 @@ def deregister(self, assert not (service_id and check_id) data = {'node': node} dc = dc or self.agent.dc + params = [] if dc: data['datacenter'] = dc if service_id: @@ -1189,8 +1201,11 @@ def deregister(self, token = token or self.agent.token if token: data['WriteRequest'] = {'Token': token} + params.append(("token",token)) return self.agent.http.put( - CB.bool(), '/v1/catalog/deregister', data=json.dumps(data)) + CB.bool(), '/v1/catalog/deregister', + data=json.dumps(data), + params=params) def datacenters(self): """ From 5f46c5f95d7b7a06046abff41f09d3b3b2237827 Mon Sep 17 00:00:00 2001 From: Vance Li Date: Thu, 16 Aug 2018 13:53:40 +0800 Subject: [PATCH 2/3] fix/Something --- consul/base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/consul/base.py b/consul/base.py index ede33580..fd227c47 100755 --- a/consul/base.py +++ b/consul/base.py @@ -1016,19 +1016,19 @@ def register( params=params, data=json.dumps(payload)) - def deregister(self, check_id,token=None): + def deregister(self, check_id): """ Remove a check from the local agent. """ params = [] - token = token or token = self.agent.token - if token: - params.append(("token",token)) - +# token = token or token = self.agent.token +# if token: +# params.append(("token",token)) +# return self.agent.http.put( CB.bool(), - '/v1/agent/check/deregister/%s' % check_id, - params=params) + '/v1/agent/check/deregister/%s' % check_id) +# params=params) def ttl_pass(self, check_id, notes=None): """ From 82deb532c4c7e37e1c6f7aa167ad9ae065c458e5 Mon Sep 17 00:00:00 2001 From: Vance Li Date: Thu, 16 Aug 2018 13:55:27 +0800 Subject: [PATCH 3/3] fixsomething --- consul/base.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/consul/base.py b/consul/base.py index fd227c47..15152f17 100755 --- a/consul/base.py +++ b/consul/base.py @@ -1020,15 +1020,9 @@ def deregister(self, check_id): """ Remove a check from the local agent. """ - params = [] -# token = token or token = self.agent.token -# if token: -# params.append(("token",token)) -# return self.agent.http.put( CB.bool(), '/v1/agent/check/deregister/%s' % check_id) -# params=params) def ttl_pass(self, check_id, notes=None): """