Commit c652cb2d by Gabe Mulley

Fix order of tracking backends

parent 3ac27a5d
...@@ -293,8 +293,8 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT, ...@@ -293,8 +293,8 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT,
# Event tracking # Event tracking
TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {})) TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {}))
EVENT_TRACKING_BACKENDS['tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKENS.get("EVENT_TRACKING_BACKENDS", {})) EVENT_TRACKING_BACKENDS['0_tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKENS.get("EVENT_TRACKING_BACKENDS", {}))
EVENT_TRACKING_BACKENDS['segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend( EVENT_TRACKING_BACKENDS['1_segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend(
AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", [])) AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", []))
SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {}) SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
......
...@@ -816,7 +816,7 @@ TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat'] ...@@ -816,7 +816,7 @@ TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat']
EVENT_TRACKING_ENABLED = True EVENT_TRACKING_ENABLED = True
EVENT_TRACKING_BACKENDS = { EVENT_TRACKING_BACKENDS = {
'tracking_logs': { '0_tracking_logs': {
'ENGINE': 'eventtracking.backends.routing.RoutingBackend', 'ENGINE': 'eventtracking.backends.routing.RoutingBackend',
'OPTIONS': { 'OPTIONS': {
'backends': { 'backends': {
...@@ -834,7 +834,7 @@ EVENT_TRACKING_BACKENDS = { ...@@ -834,7 +834,7 @@ EVENT_TRACKING_BACKENDS = {
] ]
} }
}, },
'segmentio': { '1_segmentio': {
'ENGINE': 'eventtracking.backends.routing.RoutingBackend', 'ENGINE': 'eventtracking.backends.routing.RoutingBackend',
'OPTIONS': { 'OPTIONS': {
'backends': { 'backends': {
......
...@@ -80,7 +80,7 @@ TRACKING_BACKENDS.update({ ...@@ -80,7 +80,7 @@ TRACKING_BACKENDS.update({
} }
}) })
EVENT_TRACKING_BACKENDS['tracking_logs']['OPTIONS']['backends'].update({ EVENT_TRACKING_BACKENDS['0_tracking_logs']['OPTIONS']['backends'].update({
'mongo': { 'mongo': {
'ENGINE': 'eventtracking.backends.mongodb.MongoBackend', 'ENGINE': 'eventtracking.backends.mongodb.MongoBackend',
'OPTIONS': { 'OPTIONS': {
......
...@@ -489,8 +489,8 @@ STUDENT_FILEUPLOAD_MAX_SIZE = ENV_TOKENS.get("STUDENT_FILEUPLOAD_MAX_SIZE", STUD ...@@ -489,8 +489,8 @@ STUDENT_FILEUPLOAD_MAX_SIZE = ENV_TOKENS.get("STUDENT_FILEUPLOAD_MAX_SIZE", STUD
# Event tracking # Event tracking
TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {})) TRACKING_BACKENDS.update(AUTH_TOKENS.get("TRACKING_BACKENDS", {}))
EVENT_TRACKING_BACKENDS['tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKENS.get("EVENT_TRACKING_BACKENDS", {})) EVENT_TRACKING_BACKENDS['0_tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKENS.get("EVENT_TRACKING_BACKENDS", {}))
EVENT_TRACKING_BACKENDS['segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend( EVENT_TRACKING_BACKENDS['1_segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend(
AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", [])) AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", []))
TRACKING_SEGMENTIO_WEBHOOK_SECRET = AUTH_TOKENS.get( TRACKING_SEGMENTIO_WEBHOOK_SECRET = AUTH_TOKENS.get(
"TRACKING_SEGMENTIO_WEBHOOK_SECRET", "TRACKING_SEGMENTIO_WEBHOOK_SECRET",
......
...@@ -630,7 +630,7 @@ TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat', r'^/segm ...@@ -630,7 +630,7 @@ TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat', r'^/segm
EVENT_TRACKING_ENABLED = True EVENT_TRACKING_ENABLED = True
EVENT_TRACKING_BACKENDS = { EVENT_TRACKING_BACKENDS = {
'tracking_logs': { '0_tracking_logs': {
'ENGINE': 'eventtracking.backends.routing.RoutingBackend', 'ENGINE': 'eventtracking.backends.routing.RoutingBackend',
'OPTIONS': { 'OPTIONS': {
'backends': { 'backends': {
...@@ -648,7 +648,7 @@ EVENT_TRACKING_BACKENDS = { ...@@ -648,7 +648,7 @@ EVENT_TRACKING_BACKENDS = {
] ]
} }
}, },
'segmentio': { '1_segmentio': {
'ENGINE': 'eventtracking.backends.routing.RoutingBackend', 'ENGINE': 'eventtracking.backends.routing.RoutingBackend',
'OPTIONS': { 'OPTIONS': {
'backends': { 'backends': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment