Pass the noresend correctly, use more specific exceptions

Author: rambo

project/slacksync/management/commands/sync_slack_users.py

@@ -23,7 +23,7 @@ def handle(self, *args, **options):
         if options['noresend']:
             resend = False
         sync = SlackMemberSync()
-        tbd = sync.sync_members(autoremove, )
+        tbd = sync.sync_members(autoremove, resend)
         if options['verbosity'] > 1:
             for dm in tbd:
                 if autoremove:

project/slacksync/membersync.py

@@ -6,6 +6,8 @@
 from django.conf import settings
 from members.models import Member
 from requests.sessions import Session
+from requests.exceptions import RequestException
+import slacker
 
 from .utils import api_configured, get_client
 
@@ -46,7 +48,11 @@ def sync_members(self, autodeactivate=False, resend=True):
                     if 'ok' not in resp.body or not resp.body['ok']:
                         self.logger.error("Could not invite {}, response: {}".format(member.email, resp.body))
                     time.sleep(0.25)  # rate-limit
-                except Exception as e:
+                except slacker.Error as e:
+                    if str(e) == 'sent_recently':
+                        continue
+                    raise e
+                except RequestException as e:
                     if 'Retry-After' in e.response.headers:
                         wait_s = int(e.response.headers['Retry-After'])
                         logger.warning("Asked to wait {}s before retrying invite for {}".format(wait_s, member.email))
@@ -78,7 +84,7 @@ def sync_members(self, autodeactivate=False, resend=True):
                     if 'ok' not in resp.body or not resp.body['ok']:
                         self.logger.error("Could not deactivate {}, response: {}".format(email, resp.body))
                     time.sleep(0.25)  # rate-limit
-                except Exception as e:
+                except RequestException as e:
                     if 'Retry-After' in e.response.headers:
                         wait_s = int(e.response.headers['Retry-After'])
                         logger.warning("Asked to wait {}s before retrying deactivation for {}".format(wait_s, email))