Skip to content

Commit 14e1125

Browse files
committed
Modifies the drop method to include support for deleting aws proxies
1 parent fc91379 commit 14e1125

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

rotate_proxies.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -442,14 +442,22 @@ def create(self, region=3):
442442
def drop(self):
443443
""" Drop all the proxies in current configuration (except the LB) """
444444

445-
print 'Dropping all proxies ...'
446-
proxies = rotator.linode_cmd.linode_list_proxies()
447-
for item in proxies.split('\n'):
448-
if item.strip() == "": continue
449-
ip,dc,lid,si,so = item.split(',')
450-
print '\tDropping linode',lid,'with IP',ip,'from dc',dc,'...'
451-
self.linode_cmd.linode_delete(int(lid))
452-
445+
if self.config.vps_provider == 'linode':
446+
print 'Dropping all proxies ...'
447+
proxies = rotator.linode_cmd.linode_list_proxies()
448+
for item in proxies.split('\n'):
449+
if item.strip() == "": continue
450+
ip,dc,lid,si,so = item.split(',')
451+
print '\tDropping linode',lid,'with IP',ip,'from dc',dc,'...'
452+
self.linode_cmd.linode_delete(int(lid))
453+
454+
elif self.config.vps_provider == 'aws':
455+
print 'Dropping all proxies ...'
456+
proxies = rotator.aws_command.list_proxies()
457+
for item in proxies:
458+
ip,_,instance_id = item.split(',')
459+
print '\tDropping ec2',instance_id,'with IP',ip,'...'
460+
self.aws_command.delete_ec2(instance_id)
453461
print 'done.'
454462

455463
def provision(self, count=8, add=False):

0 commit comments

Comments
 (0)