fix: Asset list gather account raise connection already closed

pull/15412/head
wangruidong 2025-05-15 15:15:32 +08:00 committed by Bryan
parent aa0125385a
commit e1f03a194b
2 changed files with 5 additions and 5 deletions

View File

@ -10,7 +10,7 @@ from accounts.models import BaseAccountQuerySet
from accounts.utils import SecretGenerator from accounts.utils import SecretGenerator
from assets.automations.base.manager import BasePlaybookManager from assets.automations.base.manager import BasePlaybookManager
from assets.const import HostTypes from assets.const import HostTypes
from common.db.utils import safe_db_connection from common.db.utils import safe_atomic_db_connection
from common.utils import get_logger from common.utils import get_logger
logger = get_logger(__name__) logger = get_logger(__name__)
@ -170,7 +170,7 @@ class BaseChangeSecretPushManager(AccountBasePlaybookManager):
) )
super().on_host_success(host, result) super().on_host_success(host, result)
with safe_db_connection(): with safe_atomic_db_connection():
account.save(update_fields=['secret', 'date_updated', 'date_change_secret', 'change_secret_status']) account.save(update_fields=['secret', 'date_updated', 'date_change_secret', 'change_secret_status'])
self.save_record(recorder) self.save_record(recorder)
@ -198,6 +198,6 @@ class BaseChangeSecretPushManager(AccountBasePlaybookManager):
) )
super().on_host_error(host, error, result) super().on_host_error(host, error, result)
with safe_db_connection(): with safe_atomic_db_connection():
account.save(update_fields=['change_secret_status', 'date_change_secret', 'date_updated']) account.save(update_fields=['change_secret_status', 'date_change_secret', 'date_updated'])
self.save_record(recorder) self.save_record(recorder)

View File

@ -17,7 +17,7 @@ from sshtunnel import SSHTunnelForwarder
from assets.automations.methods import platform_automation_methods from assets.automations.methods import platform_automation_methods
from common.const import Status from common.const import Status
from common.db.utils import safe_db_connection from common.db.utils import safe_atomic_db_connection
from common.tasks import send_mail_async from common.tasks import send_mail_async
from common.utils import get_logger, lazyproperty, is_openssh_format_key, ssh_pubkey_gen from common.utils import get_logger, lazyproperty, is_openssh_format_key, ssh_pubkey_gen
from ops.ansible import JMSInventory, DefaultCallback, SuperPlaybookRunner from ops.ansible import JMSInventory, DefaultCallback, SuperPlaybookRunner
@ -123,7 +123,7 @@ class BaseManager:
self.execution.result = self.result self.execution.result = self.result
self.execution.status = self.status self.execution.status = self.status
with safe_db_connection(): with safe_atomic_db_connection():
self.execution.save() self.execution.save()
def print_summary(self): def print_summary(self):