Call skip_event before sending data to queue
This commit is contained in:
parent
d085a7d5c2
commit
486bb9fa1c
|
@ -3,8 +3,7 @@ import logging
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from six.moves.urllib.parse import urlencode
|
from six.moves.urllib.parse import urlencode
|
||||||
from ckan.plugins import PluginImplementations
|
from ckanext.googleanalytics import config
|
||||||
from ckanext.googleanalytics import config, interfaces
|
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -13,10 +12,6 @@ EVENT_API = "CKAN API Request"
|
||||||
|
|
||||||
|
|
||||||
def send_event(data):
|
def send_event(data):
|
||||||
for p in PluginImplementations(interfaces.IGoogleAnalytics):
|
|
||||||
if p.googleanalytics_skip_event(data):
|
|
||||||
return
|
|
||||||
|
|
||||||
if isinstance(data, MeasurementProtocolData):
|
if isinstance(data, MeasurementProtocolData):
|
||||||
if data["event"] != EVENT_API:
|
if data["event"] != EVENT_API:
|
||||||
log.warning("Only API event supported by Measurement Protocol at the moment")
|
log.warning("Only API event supported by Measurement Protocol at the moment")
|
||||||
|
|
|
@ -11,7 +11,9 @@ import ckan.views.api as api
|
||||||
import ckan.views.resource as resource
|
import ckan.views.resource as resource
|
||||||
|
|
||||||
from ckan.common import g
|
from ckan.common import g
|
||||||
from ckanext.googleanalytics import utils, config
|
from ckan.plugins import PluginImplementations
|
||||||
|
|
||||||
|
from ckanext.googleanalytics import utils, config, interfaces
|
||||||
|
|
||||||
CONFIG_HANDLER_PATH = "googleanalytics.download_handler"
|
CONFIG_HANDLER_PATH = "googleanalytics.download_handler"
|
||||||
|
|
||||||
|
@ -90,6 +92,7 @@ def _post_analytics(
|
||||||
from ckanext.googleanalytics.plugin import GoogleAnalyticsPlugin
|
from ckanext.googleanalytics.plugin import GoogleAnalyticsPlugin
|
||||||
|
|
||||||
if config.tracking_id():
|
if config.tracking_id():
|
||||||
|
breakpoint()
|
||||||
if config.measurement_protocol_client_id() and event_type == utils.EVENT_API:
|
if config.measurement_protocol_client_id() and event_type == utils.EVENT_API:
|
||||||
data_dict = utils.MeasurementProtocolData({
|
data_dict = utils.MeasurementProtocolData({
|
||||||
"event": event_type,
|
"event": event_type,
|
||||||
|
@ -112,4 +115,9 @@ def _post_analytics(
|
||||||
"ea": request_obj_type + request_function,
|
"ea": request_obj_type + request_function,
|
||||||
"el": request_id,
|
"el": request_id,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
for p in PluginImplementations(interfaces.IGoogleAnalytics):
|
||||||
|
if p.googleanalytics_skip_event(data_dict):
|
||||||
|
return
|
||||||
|
|
||||||
GoogleAnalyticsPlugin.analytics_queue.put(data_dict)
|
GoogleAnalyticsPlugin.analytics_queue.put(data_dict)
|
||||||
|
|
Loading…
Reference in New Issue