Ori.livneh has submitted this change and it was merged.
Change subject: Capsule: 'isValid' => 'clientValidated'
......................................................................
Capsule: 'isValid' => 'clientValidated'
Change-Id: I7ca60c49a0446ad15cb37acd0f0a50b21a5d0f12
---
M EventLogging.php
M modules/ext.eventLogging.core.js
M server/eventlogging/schema.py
M server/tests/fixtures.py
M server/tests/test_parser.py
5 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Spage: Checked; Looks good to me, approved
diff --git a/EventLogging.php b/EventLogging.php
index 5dfb095..121d09e 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -147,13 +147,13 @@
}
$encapsulated = array(
- 'event' => $event,
- 'schema' => $schemaName,
- 'revision' => $revId,
- 'isValid' => $isValid,
- 'wiki' => $wgDBname,
- 'recvFrom' => gethostname(),
- 'timestamp' => $_SERVER[ 'REQUEST_TIME' ],
+ 'event' => $event,
+ 'schema' => $schemaName,
+ 'revision' => $revId,
+ 'clientValidated' => $isValid,
+ 'wiki' => $wgDBname,
+ 'recvFrom' => gethostname(),
+ 'timestamp' => $_SERVER[ 'REQUEST_TIME' ],
);
if ( $wgEventLoggingLogSHA1 ) {
diff --git a/modules/ext.eventLogging.core.js b/modules/ext.eventLogging.core.js
index 2a1c28e..d255c6b 100644
--- a/modules/ext.eventLogging.core.js
+++ b/modules/ext.eventLogging.core.js
@@ -184,12 +184,12 @@
event = $.extend( true, {}, event, schema.defaults );
return {
- event : event,
- isValid : self.isValid( event, schemaName ),
- revision : schema.revision,
- schema : schemaName,
- webHost : window.location.hostname,
- wiki : mw.config.get( 'wgDBname' )
+ event : event,
+ clientValidated : self.isValid( event,
schemaName ),
+ revision : schema.revision,
+ schema : schemaName,
+ webHost : window.location.hostname,
+ wiki : mw.config.get( 'wgDBname' )
};
},
diff --git a/server/eventlogging/schema.py b/server/eventlogging/schema.py
index 13fc663..3576795 100644
--- a/server/eventlogging/schema.py
+++ b/server/eventlogging/schema.py
@@ -35,7 +35,7 @@
schema_cache = {}
#: SCID of the metadata object which wraps each event.
-CAPSULE_SCID = ('EventCapsule', 5222982)
+CAPSULE_SCID = ('EventCapsule', 5262883)
#: Formats event capsule objects into URLs using the combination of
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index d89e2d8..17be66e 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.py
@@ -31,7 +31,7 @@
'isTruncated': {
'type': 'boolean'
},
- 'isValid': {
+ 'clientValidated': {
'type': 'boolean'
},
'wiki': {
@@ -104,7 +104,7 @@
'wiki': 'enwiki',
'webHost': 'en.m.wikipedia.org',
'recvFrom': 'fenari',
- 'isValid': True,
+ 'clientValidated': True,
'revision': 123,
'schema': 'TestSchema'
}
diff --git a/server/tests/test_parser.py b/server/tests/test_parser.py
index 17303a6..1e00669 100644
--- a/server/tests/test_parser.py
+++ b/server/tests/test_parser.py
@@ -30,14 +30,14 @@
"""Parser test: client-side events (%q %l %n %t %h)."""
parser = eventlogging.LogParser('%q %l %n %t %h')
raw = ('?%7B%22wiki%22%3A%22testwiki%22%2C%22schema%22%3A%22Generic'
- '%22%2C%22revision%22%3A13%2C%22isValid%22%3Atrue%2C%22event'
- '%22%3A%7B%22articleId%22%3A1%2C%22articleTitle%22%3A%22Main'
- '%20Page%22%7D%2C%22webHost%22%3A%22test.wikipedia.org%22%7D'
- '; cp3022.esams.wikimedia.org 132073 2013-01-19T23:16:38 86.'
- '149.229.149')
+ '%22%2C%22revision%22%3A13%2C%22clientValidated%22%3Atrue%2C'
+ '%22event%22%3A%7B%22articleId%22%3A1%2C%22articleTitle%22%3'
+ 'A%22Main%20Page%22%7D%2C%22webHost%22%3A%22test.wikipedia.o'
+ 'rg%22%7D; cp3022.esams.wikimedia.org 132073 2013-01-19T23:1'
+ '6:38 86.149.229.149')
parsed = {
'recvFrom': 'cp3022.esams.wikimedia.org',
- 'isValid': True,
+ 'clientValidated': True,
'wiki': 'testwiki',
'webHost': 'test.wikipedia.org',
'seqId': 132073,
@@ -56,15 +56,15 @@
"""Parser test: server-side events (%n EventLogging %j)."""
parser = eventlogging.LogParser('%n EventLogging %j')
raw = ('99 EventLogging {"revision":123,"timestamp":1358627115,"sche'
- 'ma":"FakeSchema","isValid":true,"wiki":"enwiki","event":{"ac'
- 'tion":"save\\u0020page"},"recvFrom":"fenari"}')
+ 'ma":"FakeSchema","clientValidated":true,"wiki":"enwiki","eve'
+ 'nt":{"action":"save\\u0020page"},"recvFrom":"fenari"}')
parsed = {
'recvFrom': 'fenari',
'timestamp': 1358627115,
'wiki': 'enwiki',
'seqId': 99,
'schema': 'FakeSchema',
- 'isValid': True,
+ 'clientValidated': True,
'revision': 123,
'event': {
'action': 'save page'
--
To view, visit https://gerrit.wikimedia.org/r/50265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ca60c49a0446ad15cb37acd0f0a50b21a5d0f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
