cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-12 16:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct TTL in updates.

Browse Source
This commit is contained in:
Joachim Tingvold 2016-07-26 18:34:56 +00:00
parent 2cf88739b9
commit 0d1aa7971b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/models.py
View File

@ -888,14 +888,14 @@ class Record(object):
# Adjustment to add multiple records which described in https://github.com/ngoduykhanh/PowerDNS-Admin/issues/5#issuecomment-181637576 # Adjustment to add multiple records which described in https://github.com/ngoduykhanh/PowerDNS-Admin/issues/5#issuecomment-181637576
final_records = [] final_records = []
if NEW_SCHEMA:
records = sorted(records, key = lambda item: (item["name"], item["type"])) records = sorted(records, key = lambda item: (item["name"], item["type"]))
for key, group in itertools.groupby(records, lambda item: (item["name"], item["type"])): for key, group in itertools.groupby(records, lambda item: (item["name"], item["type"], item["changetype"], item["ttl"])):
if NEW_SCHEMA:
new_record = { new_record = {
"name": key[0], "name": key[0],
"type": key[1], "type": key[1],
"ttl": records[0]['ttl'], "changetype": key[2],
"changetype": "REPLACE", "ttl": key[3],
"records": [] "records": []
} }
for item in group: for item in group:
@ -910,13 +910,13 @@ class Record(object):
"disabled": temp_disabled "disabled": temp_disabled
}) })
final_records.append(new_record) final_records.append(new_record)
else: else:
records = sorted(records, key = lambda item: (item["name"], item["type"]))
for key, group in itertools.groupby(records, lambda item: (item["name"], item["type"])):
final_records.append({ final_records.append({
"name": key[0], "name": key[0],
"type": key[1], "type": key[1],
"changetype": "REPLACE", "changetype": key[2],
"records": [ "records": [
{ {
"content": item['records'][0]['content'], "content": item['records'][0]['content'],
@ -935,10 +935,7 @@ class Record(object):
headers = {} headers = {}
headers['X-API-Key'] = PDNS_API_KEY headers['X-API-Key'] = PDNS_API_KEY
jdata1 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_delete) jdata1 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_delete)
# logging.debug('jdata1: ', jdata1)
jdata2 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_new) jdata2 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_new)
# logging.debug('jdata2: ', jdata2)
if 'error' in jdata2.keys(): if 'error' in jdata2.keys():
logging.error('Cannot apply record changes.') logging.error('Cannot apply record changes.')