paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

push_notifications: Improve error message for GCM sending issues.

Browse Source 
This addresses one of the sources of confusion in #6993.
This commit is contained in:
Tim Abbott
2017-10-13 17:21:38 -07:00
parent a48a86237d
commit 27a450b58d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/push_notifications.py
View File

@@ -155,7 +155,8 @@ def send_android_push_notification_to_user(user_profile, data):
def send_android_push_notification(devices, data, remote=False): def send_android_push_notification(devices, data, remote=False):
# type: (List[DeviceToken], Dict[str, Any], bool) -> None # type: (List[DeviceToken], Dict[str, Any], bool) -> None
if not gcm: if not gcm:
logging.warning("Attempting to send a GCM push notification, but no API key was configured") logging.warning("Skipping sending a GCM push notification since "
"PUSH_NOTIFICATION_BOUNCER_URL and ANDROID_GCM_API_KEY are both unset")
return return
reg_ids = [device.token for device in devices] reg_ids = [device.token for device in devices]

6
zerver/tests/test_push_notifications.py
View File

@@ -965,9 +965,9 @@ class GCMNotSetTest(GCMTest):
# type: (mock.MagicMock) -> None # type: (mock.MagicMock) -> None
apn.gcm = None apn.gcm = None
apn.send_android_push_notification_to_user(self.user_profile, {}) apn.send_android_push_notification_to_user(self.user_profile, {})
mock_warning.assert_called_with("Attempting to send a GCM push " mock_warning.assert_called_with(
"notification, but no API key was " "Skipping sending a GCM push notification since PUSH_NOTIFICATION_BOUNCER_URL "
"configured") "and ANDROID_GCM_API_KEY are both unset")
class GCMIOErrorTest(GCMTest): class GCMIOErrorTest(GCMTest):
@mock.patch('zerver.lib.push_notifications.gcm.json_request') @mock.patch('zerver.lib.push_notifications.gcm.json_request')