|
3 | 3 | import logging
|
4 | 4 | import time
|
5 | 5 |
|
| 6 | +import slacker |
6 | 7 | from django.conf import settings
|
7 | 8 | from members.models import Member
|
8 |
| -from requests.sessions import Session |
9 | 9 | from requests.exceptions import RequestException
|
10 |
| -import slacker |
| 10 | +from requests.sessions import Session |
11 | 11 |
|
12 | 12 | from .utils import api_configured, get_client
|
13 | 13 |
|
@@ -51,12 +51,15 @@ def sync_members(self, autodeactivate=False, resend=True):
|
51 | 51 | except slacker.Error as e:
|
52 | 52 | if str(e) == 'sent_recently':
|
53 | 53 | continue
|
| 54 | + if str(e) == 'invalid_email': |
| 55 | + logger.error("Slack says {} is invalid_email".format(member.email)) |
| 56 | + continue |
54 | 57 | raise e
|
55 | 58 | except RequestException as e:
|
56 | 59 | if 'Retry-After' in e.response.headers:
|
57 | 60 | wait_s = int(e.response.headers['Retry-After'])
|
58 | 61 | logger.warning("Asked to wait {}s before retrying invite for {}".format(wait_s, member.email))
|
59 |
| - time.sleep(wait_s*1.5) |
| 62 | + time.sleep(wait_s * 1.5) |
60 | 63 | add_members.append(member)
|
61 | 64 | continue
|
62 | 65 | else:
|
@@ -88,7 +91,7 @@ def sync_members(self, autodeactivate=False, resend=True):
|
88 | 91 | if 'Retry-After' in e.response.headers:
|
89 | 92 | wait_s = int(e.response.headers['Retry-After'])
|
90 | 93 | logger.warning("Asked to wait {}s before retrying deactivation for {}".format(wait_s, email))
|
91 |
| - time.sleep(wait_s*1.5) |
| 94 | + time.sleep(wait_s * 1.5) |
92 | 95 | remove_iter.append(email)
|
93 | 96 | continue
|
94 | 97 | else:
|
|
0 commit comments