[MediaWiki-commits] [Gerrit] Drop clientValidated and isTruncated fields from event capsule - change (mediawiki...EventLogging)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/185616

Change subject: Drop clientValidated and isTruncated fields from event capsule
......................................................................

Drop clientValidated and isTruncated fields from event capsule

Upgrade the code to the latest version of the EventCapsule schema, which drops
both 'clientValidated' and 'isTruncated' -- fields which are of interest to no
one.

SCID: 10981547
Change-Id: I0bf3bd917640fe0ea6bb86c789372b13677a6ee2
---
M modules/ext.eventLogging.core.js
M server/eventlogging/schema.py
M server/tests/fixtures.py
3 files changed, 7 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging 
refs/changes/16/185616/1

diff --git a/modules/ext.eventLogging.core.js b/modules/ext.eventLogging.core.js
index 10b3b17..05fac4c 100644
--- a/modules/ext.eventLogging.core.js
+++ b/modules/ext.eventLogging.core.js
@@ -183,20 +183,18 @@
                prepare: function ( schemaName, eventData ) {
                        var schema = self.getSchema( schemaName ),
                                event = $.extend( true, {}, schema.defaults, 
eventData ),
-                               errors = self.validate( event, schema.schema ),
-                               valid = !errors.length;
+                               errors = self.validate( event, schema.schema );
 
                        while ( errors.length ) {
                                mw.track( 'eventlogging.error', mw.format( 
'[$1] $2', schemaName, errors.pop() ) );
                        }
 
                        return {
-                               event            : event,
-                               clientValidated  : valid,
-                               revision         : schema.revision || -1,
-                               schema           : schemaName,
-                               webHost          : location.hostname,
-                               wiki             : mw.config.get( 'wgDBname' )
+                               event    : event,
+                               revision : schema.revision || -1,
+                               schema   : schemaName,
+                               webHost  : location.hostname,
+                               wiki     : mw.config.get( 'wgDBname' )
                        };
                },
 
diff --git a/server/eventlogging/schema.py b/server/eventlogging/schema.py
index fd3a579..0fb8400 100644
--- a/server/eventlogging/schema.py
+++ b/server/eventlogging/schema.py
@@ -34,7 +34,7 @@
 schema_cache = {}
 
 # SCID of the metadata object which wraps each event.
-CAPSULE_SCID = ('EventCapsule', 8326736)
+CAPSULE_SCID = ('EventCapsule', 10981547)
 
 
 def get_schema(scid, encapsulate=False):
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index e060692..aa7e4ad 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.py
@@ -28,9 +28,6 @@
                 'type': 'object',
                 'required': True
             },
-            'isTruncated': {
-                'type': 'boolean'
-            },
             'clientValidated': {
                 'type': 'boolean'
             },
@@ -105,7 +102,6 @@
     'seqId': 12345,
     'clientIp': '127.0.0.1',
     'timestamp': 1358791834912,
-    'isTruncated': False,
     'wiki': 'enwiki',
     'webHost': 'en.m.wikipedia.org',
     'recvFrom': 'fenari',
@@ -123,7 +119,6 @@
     'seqId': 12345,
     'clientIp': '127.0.0.1',
     'timestamp': 1358791834912,
-    'isTruncated': False,
     'wiki': 'enwiki',
     'webHost': 'en.m.wikipedia.org',
     'recvFrom': 'fenari',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bf3bd917640fe0ea6bb86c789372b13677a6ee2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>

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