[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Annotate the job event with pipeline property.

2017-09-15 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378078 )

Change subject: [Config] Annotate the job event with pipeline property.
..


[Config] Annotate the job event with pipeline property.

To be able to log and debug the old vs new JobQueue jobs
we can add a 'pipeline' property to the event and set it
to EventBus in the new pipeline. That way we can log all
the event executions and compare the correctness side-by-side.

Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
---
M scap/templates/config.yaml.j2
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 057746e..94004ac 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -40,7 +40,15 @@
   uri: '<%= jobrunner_uri %>'
   headers:
 content-type: 'application/json'
-  body: '{{globals.message}}'
+  # Temporary so that we could add a 'pipeline' property to 
the params.
+  body:
+database: '{{message.database}}'
+meta: '{{message.meta}}'
+page_namespace: '{{message.page_namespace}}'
+page_title: '{{message.page_title}}'
+params: '{{merge(message.params, {"pipeline": 
"EventBus"})}}'
+sha1: '{{message.sha1}}'
+type: '{{message.type}}'
 
 
 # Number of worker processes to spawn.

-- 
To view, visit https://gerrit.wikimedia.org/r/378078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Annotate the job event with pipeline property.

2017-09-14 Thread Ppchelko (Code Review) 
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378078 )

Change subject: [Config] Annotate the job event with pipeline property.
..

[Config] Annotate the job event with pipeline property.

To be able to log and debug the old vs new JobQueue jobs
we can add a 'pipeline' property to the event and set it
to EventBus in the new pipeline. That way we can log all
the event executions and compare the correctness side-by-side.

Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/78/378078/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 057746e..45e9f3e 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -40,7 +40,7 @@
   uri: '<%= jobrunner_uri %>'
   headers:
 content-type: 'application/json'
-  body: '{{globals.message}}'
+  body: '{{merge(globals.message, {"pipeline": "EventBus"})}}'
 
 
 # Number of worker processes to spawn.

-- 
To view, visit https://gerrit.wikimedia.org/r/378078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits