dave
/
escleaner
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix breakage with trailing slashes

This commit is contained in:
dave 2017-05-15 08:48:05 -07:00
parent 4b7a0e70cc
commit a386fe990e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
escleaner/__init__.py
View File

@ -1 +1 @@
__version__ = "0.0.3" __version__ = "0.0.4"

9
escleaner/escleaner.py
View File

@ -3,6 +3,7 @@
import requests import requests
import re import re
from datetime import datetime, timedelta from datetime import datetime, timedelta
from urllib.parse import urlparse, urlunparse
def get_indices(): def get_indices():
@ -16,7 +17,7 @@ def get_indices():
def delete_index(index, dry_run): def delete_index(index, dry_run):
if index: if index:
print("deleting {}".format(index)) print("deleting {}".format(index))
del_url = "{}{}".format(es_url, index) del_url = "{}/{}".format(es_url, index)
if not dry_run: if not dry_run:
print(requests.delete(del_url).text) print(requests.delete(del_url).text)
@ -24,9 +25,9 @@ def delete_index(index, dry_run):
def main(url, index, days, dry_run=False): def main(url, index, days, dry_run=False):
global es_url global es_url
global logstash_pattern global logstash_pattern
if url.endswith("/"):
url = url[0:-1] es_url = urlunparse(urlparse(url)).rstrip("/")
es_url = url
logstash_pattern = re.compile(r'%s\-(([0-9]{4})\.([0-9]{2})\.([0-9]{2}))' % index) logstash_pattern = re.compile(r'%s\-(([0-9]{4})\.([0-9]{2})\.([0-9]{2}))' % index)
deleteBefore = datetime.now() - timedelta(days=days) deleteBefore = datetime.now() - timedelta(days=days)