github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-05 02:56:31 +00:00
Code Issues Projects Releases Wiki Activity

[Update] ansible disk bug

Browse Source
This commit is contained in:
ibuler 2018-01-26 16:06:23 +08:00
parent f6d21585ab
commit f0b9a11482
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/tasks.py
View File

@ -19,7 +19,7 @@ FORKS = 10
TIMEOUT = 60 TIMEOUT = 60
logger = get_logger(__file__) logger = get_logger(__file__)
CACHE_MAX_TIME = 60*60*60 CACHE_MAX_TIME = 60*60*60
disk_pattern = re.compile(r'^hd|sd|xvd') disk_pattern = re.compile(r'^hd|sd|xvd|vd')
@shared_task @shared_task

1
apps/users/signals.py
View File

@ -16,5 +16,6 @@ def on_user_created(sender, instance=None, created=False, **kwargs):
logger.debug("Receive user `{}` create signal".format(instance.name)) logger.debug("Receive user `{}` create signal".format(instance.name))
from .utils import send_user_created_mail from .utils import send_user_created_mail
logger.info(" - Sending welcome mail ...".format(instance.name)) logger.info(" - Sending welcome mail ...".format(instance.name))
if instance.email:
send_user_created_mail(instance) send_user_created_mail(instance)

3
apps/users/utils.py
View File

@ -59,7 +59,10 @@ def send_user_created_mail(user):
'login_url': reverse('users:login', external=True), 'login_url': reverse('users:login', external=True),
} }
if settings.DEBUG: if settings.DEBUG:
try:
print(message) print(message)
except OSError:
pass
send_mail_async.delay(subject, message, recipient_list, html_message=message) send_mail_async.delay(subject, message, recipient_list, html_message=message)