From abd0207b74e44b489e2cf5eda8c0648add9142a1 Mon Sep 17 00:00:00 2001 From: Arnaud Limbourg Date: Sun, 6 Jul 2014 14:55:52 +0200 Subject: [PATCH 1/3] vimeo plugins not working The signatuare call to backend must have changed at some point and requires 'config' as a parameter Query to ES in the analytics plugin needed to be updated (not sure it is correct though) --- plugins/vimeo_add_forms.py | 8 ++++---- plugins/vimeo_analytics.py | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/vimeo_add_forms.py b/plugins/vimeo_add_forms.py index d4a9e95..e83bac0 100644 --- a/plugins/vimeo_add_forms.py +++ b/plugins/vimeo_add_forms.py @@ -15,7 +15,7 @@ @route('/events/add/engineering', method='GET') @route('/events/add/engineering/ts=', method='GET') def add_engineering_get(**kwargs): - backend = Backend() + backend = Backend(config) return page(config, backend, state, body=template( 'tpl/events_add', @@ -33,7 +33,7 @@ def add_engineering_get(**kwargs): @route('/events/add/marketing', method='GET') @route('/events/add/marketing/ts=', method='GET') def add_marketing_get(**kwargs): - backend = Backend() + backend = Backend(config) return page(config, backend, state, body=template( 'tpl/events_add', @@ -50,7 +50,7 @@ def add_marketing_get(**kwargs): @route('/events/add/product', method='GET') @route('/events/add/product/ts=', method='GET') def add_product_get(**kwargs): - backend = Backend() + backend = Backend(config) return page(config, backend, state, body=template( 'tpl/events_add', @@ -67,7 +67,7 @@ def add_product_get(**kwargs): @route('/events/add/analytics', method='GET') @route('/events/add/analytics/ts=', method='GET') def add_analytics_get(**kwargs): - backend = Backend() + backend = Backend(config) return page(config, backend, state, body=template( 'tpl/events_add', diff --git a/plugins/vimeo_analytics.py b/plugins/vimeo_analytics.py index 0c51b87..971b18a 100644 --- a/plugins/vimeo_analytics.py +++ b/plugins/vimeo_analytics.py @@ -14,13 +14,12 @@ def events_vimeo_analytics(): # means (incl scripts), so if category is not set, but expected FX is, we # count those as engineering - backend = Backend() + backend = Backend(config) events = [] query = { - "field": { - "category": { - "query": "*" - } + "query_string": { + "fields": ["category"], + "query": "*" } } @@ -52,4 +51,4 @@ def line_yielder(events): @route('/events/table/vimeo_analytics') def events_table_vimeo_analytics(**kwargs): - return page_light(config, Backend(), {}, body=template('plugins/vimeo_analytics_table', events=events_vimeo_analytics()), **kwargs) + return page_light(config, Backend(config), {}, body=template('plugins/vimeo_analytics_table', events=events_vimeo_analytics()), **kwargs) From 00badb3c50af94842e5dbc7df5d16fab18204141 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 6 Aug 2014 17:38:30 -0400 Subject: [PATCH 2/3] autoload standard config in backend if no config specified --- backend.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend.py b/backend.py index d3387da..b84ed2f 100644 --- a/backend.py +++ b/backend.py @@ -110,6 +110,9 @@ def __init__(self, config=None): from rawes.elastic_exception import ElasticException # pyflakes doesn't like globals()['ElasticException'] = ElasticException so: self.ElasticException = ElasticException + if config is None: + import config + config = Config(config) self.config = config self.es = rawes.Elastic(config.es_url, except_on_error=True) # make sure the index exists From 8b228d90103504238a01a28843c971b4f11a417e Mon Sep 17 00:00:00 2001 From: Arnaud Limbourg Date: Thu, 7 Aug 2014 10:18:05 +0200 Subject: [PATCH 3/3] patch made obsolete by recent commit on source repo --- plugins/vimeo_add_forms.py | 8 ++++---- plugins/vimeo_analytics.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/vimeo_add_forms.py b/plugins/vimeo_add_forms.py index e83bac0..d4a9e95 100644 --- a/plugins/vimeo_add_forms.py +++ b/plugins/vimeo_add_forms.py @@ -15,7 +15,7 @@ @route('/events/add/engineering', method='GET') @route('/events/add/engineering/ts=', method='GET') def add_engineering_get(**kwargs): - backend = Backend(config) + backend = Backend() return page(config, backend, state, body=template( 'tpl/events_add', @@ -33,7 +33,7 @@ def add_engineering_get(**kwargs): @route('/events/add/marketing', method='GET') @route('/events/add/marketing/ts=', method='GET') def add_marketing_get(**kwargs): - backend = Backend(config) + backend = Backend() return page(config, backend, state, body=template( 'tpl/events_add', @@ -50,7 +50,7 @@ def add_marketing_get(**kwargs): @route('/events/add/product', method='GET') @route('/events/add/product/ts=', method='GET') def add_product_get(**kwargs): - backend = Backend(config) + backend = Backend() return page(config, backend, state, body=template( 'tpl/events_add', @@ -67,7 +67,7 @@ def add_product_get(**kwargs): @route('/events/add/analytics', method='GET') @route('/events/add/analytics/ts=', method='GET') def add_analytics_get(**kwargs): - backend = Backend(config) + backend = Backend() return page(config, backend, state, body=template( 'tpl/events_add', diff --git a/plugins/vimeo_analytics.py b/plugins/vimeo_analytics.py index 971b18a..d512a25 100644 --- a/plugins/vimeo_analytics.py +++ b/plugins/vimeo_analytics.py @@ -14,7 +14,7 @@ def events_vimeo_analytics(): # means (incl scripts), so if category is not set, but expected FX is, we # count those as engineering - backend = Backend(config) + backend = Backend() events = [] query = { "query_string": { @@ -51,4 +51,4 @@ def line_yielder(events): @route('/events/table/vimeo_analytics') def events_table_vimeo_analytics(**kwargs): - return page_light(config, Backend(config), {}, body=template('plugins/vimeo_analytics_table', events=events_vimeo_analytics()), **kwargs) + return page_light(config, Backend(), {}, body=template('plugins/vimeo_analytics_table', events=events_vimeo_analytics()), **kwargs)