cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-12-30 15:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #655 from eht16/issue428_sync_performance

Browse Source 
Perform domain sync within a single transaction
This commit is contained in:
Khanh Ngo 2020-02-12 09:56:41 +07:00 committed by GitHub
commit d497fdee8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
powerdnsadmin/models/domain.py
View File

@ -138,7 +138,7 @@ class Domain(db.Model):
should_removed_db_domain = list( should_removed_db_domain = list(
set(list_db_domain).difference(list_jdomain)) set(list_db_domain).difference(list_jdomain))
for domain_name in should_removed_db_domain: for domain_name in should_removed_db_domain:
self.delete_domain_from_pdnsadmin(domain_name) self.delete_domain_from_pdnsadmin(domain_name, do_commit=False)
except Exception as e: except Exception as e:
current_app.logger.error( current_app.logger.error(
'Can not delete domain from DB. DETAIL: {0}'.format(e)) 'Can not delete domain from DB. DETAIL: {0}'.format(e))
@ -155,22 +155,24 @@ class Domain(db.Model):
account_id = None account_id = None
domain = dict_db_domain.get(data['name'].rstrip('.'), None) domain = dict_db_domain.get(data['name'].rstrip('.'), None)
if domain: if domain:
self.update_pdns_admin_domain(domain, account_id, data) self.update_pdns_admin_domain(domain, account_id, data, do_commit=False)
else: else:
# add new domain # add new domain
self.add_domain_to_powerdns_admin(domain=data) self.add_domain_to_powerdns_admin(domain=data, do_commit=False)
db.session.commit()
current_app.logger.info('Update domain finished') current_app.logger.info('Update domain finished')
return { return {
'status': 'ok', 'status': 'ok',
'msg': 'Domain table has been updated successfully' 'msg': 'Domain table has been updated successfully'
} }
except Exception as e: except Exception as e:
db.session.rollback()
current_app.logger.error( current_app.logger.error(
'Can not update domain table. Error: {0}'.format(e)) 'Can not update domain table. Error: {0}'.format(e))
return {'status': 'error', 'msg': 'Can not update domain table'} return {'status': 'error', 'msg': 'Can not update domain table'}
def update_pdns_admin_domain(self, domain, account_id, data): def update_pdns_admin_domain(self, domain, account_id, data, do_commit=True):
# existing domain, only update if something actually has changed # existing domain, only update if something actually has changed
if (domain.master != str(data['masters']) if (domain.master != str(data['masters'])
or domain.type != data['kind'] or domain.type != data['kind']
@ -188,6 +190,7 @@ class Domain(db.Model):
domain.dnssec = 1 if data['dnssec'] else 0 domain.dnssec = 1 if data['dnssec'] else 0
domain.account_id = account_id domain.account_id = account_id
try: try:
if do_commit:
db.session.commit() db.session.commit()
current_app.logger.info("Updated PDNS-Admin domain {0}".format( current_app.logger.info("Updated PDNS-Admin domain {0}".format(
domain.name)) domain.name))
@ -255,7 +258,7 @@ class Domain(db.Model):
current_app.logger.debug(traceback.format_exc()) current_app.logger.debug(traceback.format_exc())
return {'status': 'error', 'msg': 'Cannot add this domain.'} return {'status': 'error', 'msg': 'Cannot add this domain.'}
def add_domain_to_powerdns_admin(self, domain=None, domain_dict=None): def add_domain_to_powerdns_admin(self, domain=None, domain_dict=None, do_commit=True):
""" """
Read Domain from PowerDNS and add into PDNS-Admin Read Domain from PowerDNS and add into PDNS-Admin
""" """
@ -295,6 +298,7 @@ class Domain(db.Model):
d.account_id = account_id d.account_id = account_id
db.session.add(d) db.session.add(d)
try: try:
if do_commit:
db.session.commit() db.session.commit()
current_app.logger.info( current_app.logger.info(
"Synced PowerDNS Domain to PDNS-Admin: {0}".format(d.name)) "Synced PowerDNS Domain to PDNS-Admin: {0}".format(d.name))
@ -508,24 +512,22 @@ class Domain(db.Model):
domain_name)) domain_name))
return {'status': 'ok', 'msg': 'Delete domain successfully'} return {'status': 'ok', 'msg': 'Delete domain successfully'}
def delete_domain_from_pdnsadmin(self, domain_name): def delete_domain_from_pdnsadmin(self, domain_name, do_commit=True):
# Revoke permission before deleting domain # Revoke permission before deleting domain
domain = Domain.query.filter(Domain.name == domain_name).first() domain = Domain.query.filter(Domain.name == domain_name).first()
domain_user = DomainUser.query.filter( domain_user = DomainUser.query.filter(
DomainUser.domain_id == domain.id) DomainUser.domain_id == domain.id)
if domain_user: if domain_user:
domain_user.delete() domain_user.delete()
db.session.commit()
domain_setting = DomainSetting.query.filter( domain_setting = DomainSetting.query.filter(
DomainSetting.domain_id == domain.id) DomainSetting.domain_id == domain.id)
if domain_setting: if domain_setting:
domain_setting.delete() domain_setting.delete()
db.session.commit()
domain.apikeys[:] = [] domain.apikeys[:] = []
db.session.commit()
# then remove domain # then remove domain
Domain.query.filter(Domain.name == domain_name).delete() Domain.query.filter(Domain.name == domain_name).delete()
if do_commit:
db.session.commit() db.session.commit()
current_app.logger.info( current_app.logger.info(
"Deleted domain successfully from pdnsADMIN: {}".format( "Deleted domain successfully from pdnsADMIN: {}".format(