From f0b9a11482aeaaa646f7a468ee8f257fe9cb000d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 26 Jan 2018 16:06:23 +0800
Subject: [PATCH] [Update] ansible disk bug

---
 apps/assets/tasks.py  | 2 +-
 apps/users/signals.py | 3 ++-
 apps/users/utils.py   | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py
index f06f720d9..454dc5d19 100644
--- a/apps/assets/tasks.py
+++ b/apps/assets/tasks.py
@@ -19,7 +19,7 @@ FORKS = 10
 TIMEOUT = 60
 logger = get_logger(__file__)
 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
diff --git a/apps/users/signals.py b/apps/users/signals.py
index 39e57f5a5..f942c39b7 100644
--- a/apps/users/signals.py
+++ b/apps/users/signals.py
@@ -16,5 +16,6 @@ def on_user_created(sender, instance=None, created=False, **kwargs):
         logger.debug("Receive user `{}` create signal".format(instance.name))
         from .utils import send_user_created_mail
         logger.info("   - Sending welcome mail ...".format(instance.name))
-        send_user_created_mail(instance)
+        if instance.email:
+            send_user_created_mail(instance)
 
diff --git a/apps/users/utils.py b/apps/users/utils.py
index fd03ad97d..abc4b2018 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -59,7 +59,10 @@ def send_user_created_mail(user):
         'login_url': reverse('users:login', external=True),
     }
     if settings.DEBUG:
-        print(message)
+        try:
+            print(message)
+        except OSError:
+            pass
 
     send_mail_async.delay(subject, message, recipient_list, html_message=message)