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

Merge pull request #313 from tmuncks/tolerate-pdns-3-api

Browse Source 
Tolerate pdns 3.x API deficiencies
This commit is contained in:
Khanh Ngo 2018-08-01 21:21:00 +07:00 committed by GitHub
commit 501b817808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models.py
View File

@ -486,6 +486,10 @@ class Account(db.Model):
""" """
Convert account_name to account_id Convert account_name to account_id
""" """
# Skip actual database lookup for empty queries
if account_name is None or account_name == "":
return None
account = Account.query.filter(Account.name == account_name).first() account = Account.query.filter(Account.name == account_name).first()
if account is None: if account is None:
return None return None
@ -759,7 +763,11 @@ class Domain(db.Model):
# update/add new domain # update/add new domain
for data in jdata: for data in jdata:
if 'account' in data:
account_id = Account().get_id_by_name(data['account']) account_id = Account().get_id_by_name(data['account'])
else:
logging.debug("No 'account' data found in API result - Unsupported PowerDNS version?")
account_id = None
d = dict_db_domain.get(data['name'].rstrip('.'), None) d = dict_db_domain.get(data['name'].rstrip('.'), None)
changed = False changed = False
if d: if d: