Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
14e1ef13
Commit
14e1ef13
authored
Sep 29, 2015
by
Bill DeRusha
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9865 from edx/bderusha/segment-version-bump
Bump version of segemnt's analytics-python package to 1.1.0
parents
a4c99964
4f14d4f7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
common/djangoapps/third_party_auth/pipeline.py
+2
-1
lms/startup.py
+2
-2
requirements/edx/base.txt
+1
-1
No files found.
common/djangoapps/third_party_auth/pipeline.py
View file @
14e1ef13
...
@@ -64,6 +64,7 @@ import urllib
...
@@ -64,6 +64,7 @@ import urllib
import
analytics
import
analytics
from
eventtracking
import
tracker
from
eventtracking
import
tracker
from
django.conf
import
settings
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
django.http
import
HttpResponseBadRequest
from
django.http
import
HttpResponseBadRequest
...
@@ -592,7 +593,7 @@ def login_analytics(strategy, auth_entry, *args, **kwargs):
...
@@ -592,7 +593,7 @@ def login_analytics(strategy, auth_entry, *args, **kwargs):
elif
auth_entry
in
[
AUTH_ENTRY_ACCOUNT_SETTINGS
]:
elif
auth_entry
in
[
AUTH_ENTRY_ACCOUNT_SETTINGS
]:
event_name
=
'edx.bi.user.account.linked'
event_name
=
'edx.bi.user.account.linked'
if
event_name
is
not
None
:
if
event_name
is
not
None
and
hasattr
(
settings
,
'SEGMENT_IO_LMS_KEY'
)
and
settings
.
SEGMENT_IO_LMS_KEY
:
tracking_context
=
tracker
.
get_tracker
()
.
resolve_context
()
tracking_context
=
tracker
.
get_tracker
()
.
resolve_context
()
analytics
.
track
(
analytics
.
track
(
kwargs
[
'user'
]
.
id
,
kwargs
[
'user'
]
.
id
,
...
...
lms/startup.py
View file @
14e1ef13
...
@@ -40,8 +40,8 @@ def run():
...
@@ -40,8 +40,8 @@ def run():
# Initialize Segment.io analytics module. Flushes first time a message is received and
# Initialize Segment.io analytics module. Flushes first time a message is received and
# every 50 messages thereafter, or if 10 seconds have passed since last flush
# every 50 messages thereafter, or if 10 seconds have passed since last flush
if
settings
.
FEATURES
.
get
(
'SEGMENT_IO_LMS'
)
and
hasattr
(
settings
,
'SEGMENT_IO_LMS_KEY'
)
:
if
settings
.
FEATURES
.
get
(
'SEGMENT_IO_LMS'
)
and
hasattr
(
settings
,
'SEGMENT_IO_LMS_KEY'
)
and
settings
.
SEGMENT_IO_LMS_KEY
:
# pylint: disable=line-too-long
analytics
.
init
(
settings
.
SEGMENT_IO_LMS_KEY
,
flush_at
=
50
)
analytics
.
write_key
=
settings
.
SEGMENT_IO_LMS_KEY
# register any dependency injections that we need to support in edx_proctoring
# register any dependency injections that we need to support in edx_proctoring
# right now edx_proctoring is dependent on the openedx.core.djangoapps.credit
# right now edx_proctoring is dependent on the openedx.core.djangoapps.credit
...
...
requirements/edx/base.txt
View file @
14e1ef13
...
@@ -147,7 +147,7 @@ splinter==0.5.4
...
@@ -147,7 +147,7 @@ splinter==0.5.4
testtools==0.9.34
testtools==0.9.34
# Used for Segment.io analytics
# Used for Segment.io analytics
analytics-python==
0.4.4
analytics-python==
1.1.0
# Needed for mailchimp(mailing djangoapp)
# Needed for mailchimp(mailing djangoapp)
mailsnake==1.6.2
mailsnake==1.6.2
...
...
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