Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
notifier
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
notifier
Commits
91005eb2
Commit
91005eb2
authored
May 11, 2016
by
Sanford Student
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better syntax
parent
9a65a4e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
notifier/settings.py
+2
-2
notifier/tasks.py
+3
-2
No files found.
notifier/settings.py
View file @
91005eb2
...
@@ -203,4 +203,4 @@ LOCALE_PATHS = (os.path.join(os.path.dirname(os.path.dirname(__file__)), 'locale
...
@@ -203,4 +203,4 @@ LOCALE_PATHS = (os.path.join(os.path.dirname(os.path.dirname(__file__)), 'locale
# Parameterize digest logo image url
# Parameterize digest logo image url
LOGO_IMAGE_URL
=
os
.
getenv
(
'LOGO_IMAGE_URL'
,
"{}/static/images/edx-theme/edx-header-logo.png"
.
format
(
LMS_URL_BASE
))
LOGO_IMAGE_URL
=
os
.
getenv
(
'LOGO_IMAGE_URL'
,
"{}/static/images/edx-theme/edx-header-logo.png"
.
format
(
LMS_URL_BASE
))
DEAD_MANS_SNITCH_URL
=
os
.
getenv
(
'DEAD_MANS_SNITCH_URL'
,
'http://localhost:8010'
)
DEAD_MANS_SNITCH_URL
=
os
.
getenv
(
'DEAD_MANS_SNITCH_URL'
,
''
)
\ No newline at end of file
\ No newline at end of file
notifier/tasks.py
View file @
91005eb2
...
@@ -4,7 +4,7 @@ Celery tasks for generating and sending digest emails.
...
@@ -4,7 +4,7 @@ Celery tasks for generating and sending digest emails.
from
contextlib
import
closing
from
contextlib
import
closing
from
datetime
import
datetime
,
timedelta
from
datetime
import
datetime
,
timedelta
import
logging
import
logging
from
requests
import
request
import
requests
from
boto.ses.exceptions
import
SESMaxSendingRateExceededError
from
boto.ses.exceptions
import
SESMaxSendingRateExceededError
import
celery
import
celery
...
@@ -51,7 +51,8 @@ def generate_and_send_digests(users, from_dt, to_dt):
...
@@ -51,7 +51,8 @@ def generate_and_send_digests(users, from_dt, to_dt):
msgs
.
append
(
msg
)
msgs
.
append
(
msg
)
if
msgs
:
if
msgs
:
cx
.
send_messages
(
msgs
)
cx
.
send_messages
(
msgs
)
request
(
"POST"
,
settings
.
DEAD_MANS_SNITCH_URL
)
if
settings
.
DEAD_MANS_SNITCH_URL
:
requests
.
post
(
settings
.
DEAD_MANS_SNITCH_URL
)
except
(
CommentsServiceException
,
SESMaxSendingRateExceededError
)
as
e
:
except
(
CommentsServiceException
,
SESMaxSendingRateExceededError
)
as
e
:
# only retry if no messages were successfully sent yet.
# only retry if no messages were successfully sent yet.
if
not
any
((
getattr
(
msg
,
'extra_headers'
,
{})
.
get
(
'status'
)
==
200
for
msg
in
msgs
)):
if
not
any
((
getattr
(
msg
,
'extra_headers'
,
{})
.
get
(
'status'
)
==
200
for
msg
in
msgs
)):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment