Skip to content

Commit 073df9d

Browse files
ar2rsawseenar2rsawseen
committed
Merge conflict resolved
1 parent fa9ce3a commit 073df9d

File tree

10 files changed

+46
-47
lines changed

10 files changed

+46
-47
lines changed

‎api/parts/data/events.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ var countlyEvents = {},
4141
continue;
4242
}
4343

44-
if (plugins.getConfig("api").event_limit &&
45-
appEvents.length >= plugins.getConfig("api").event_limit &&
44+
if (plugins.getConfig("api", params.app && params.app.plugins, true).event_limit &&
45+
appEvents.length >= plugins.getConfig("api", params.app && params.app.plugins, true).event_limit &&
4646
appEvents.indexOf(currEvent.key) === -1) {
4747
continue;
4848
}
@@ -69,10 +69,10 @@ var countlyEvents = {},
6969
continue;
7070
}
7171

72-
if (plugins.getConfig("api").event_segmentation_limit &&
72+
if (plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_limit &&
7373
appSegments[currEvent.key] &&
7474
appSegments[currEvent.key].indexOf(segKey) === -1 &&
75-
appSegments[currEvent.key].length >= plugins.getConfig("api").event_segmentation_limit) {
75+
appSegments[currEvent.key].length >= plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_limit) {
7676
continue;
7777
}
7878

@@ -157,8 +157,8 @@ var countlyEvents = {},
157157
continue;
158158
}
159159

160-
if (plugins.getConfig("api").event_limit &&
161-
appEvents.length >= plugins.getConfig("api").event_limit &&
160+
if (plugins.getConfig("api", params.app && params.app.plugins, true).event_limit &&
161+
appEvents.length >= plugins.getConfig("api", params.app && params.app.plugins, true).event_limit &&
162162
appEvents.indexOf(currEvent.key) === -1) {
163163
continue;
164164
}
@@ -221,10 +221,10 @@ var countlyEvents = {},
221221
continue;
222222
}
223223

224-
if (plugins.getConfig("api").event_segmentation_limit &&
224+
if (plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_limit &&
225225
appSegments[currEvent.key] &&
226226
appSegments[currEvent.key].indexOf(segKey) === -1 &&
227-
appSegments[currEvent.key].length >= plugins.getConfig("api").event_segmentation_limit) {
227+
appSegments[currEvent.key].length >= plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_limit) {
228228
continue;
229229
}
230230

@@ -244,12 +244,12 @@ var countlyEvents = {},
244244

245245
var postfix = common.crypto.createHash("md5").update(tmpSegVal).digest('base64')[0];
246246

247-
if (plugins.getConfig("api").event_segmentation_value_limit &&
247+
if (plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_value_limit &&
248248
appSgValues[eventCollectionName] &&
249249
appSgValues[eventCollectionName]["no-segment" + "_" + dateIds.zero + "_" + postfix] &&
250250
appSgValues[eventCollectionName]["no-segment" + "_" + dateIds.zero + "_" + postfix][segKey] &&
251251
appSgValues[eventCollectionName]["no-segment" + "_" + dateIds.zero + "_" + postfix][segKey].indexOf(tmpSegVal) === -1 &&
252-
appSgValues[eventCollectionName]["no-segment" + "_" + dateIds.zero + "_" + postfix][segKey].length >= plugins.getConfig("api").event_segmentation_value_limit) {
252+
appSgValues[eventCollectionName]["no-segment" + "_" + dateIds.zero + "_" + postfix][segKey].length >= plugins.getConfig("api", params.app && params.app.plugins, true).event_segmentation_value_limit) {
253253
continue;
254254
}
255255

@@ -292,7 +292,7 @@ var countlyEvents = {},
292292
params.time = time;
293293
}
294294

295-
if (!plugins.getConfig("api").safe) {
295+
if (!plugins.getConfig("api", params.app && params.app.plugins, true).safe) {
296296
for (var collection in eventCollections) {
297297
if (eventSegmentsZeroes[collection] && eventSegmentsZeroes[collection].length) {
298298
for (var i = 0; i < eventSegmentsZeroes[collection].length; i++) {

‎api/parts/data/fetch.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ var fetch = {},
589589
fetch.getMetric(params, 'device_details', null, output);
590590
break;
591591
case 'cities':
592-
if (plugins.getConfig("api").city_data !== false) {
592+
if (plugins.getConfig("api", params.app && params.app.plugins, true).city_data !== false) {
593593
fetch.getMetric(params, "cities", "cities", output);
594594
} else {
595595
common.returnOutput(params, []);
@@ -747,7 +747,7 @@ var fetch = {},
747747
options.db = common.db;
748748
}
749749

750-
if(!plugins.getConfig("api").total_users){
750+
if(!plugins.getConfig("api", params.app && params.app.plugins, true).total_users){
751751
return callback([]);
752752
}
753753
var periodObj = getPeriodObj(params);
@@ -812,7 +812,7 @@ var fetch = {},
812812
}
813813
], { allowDiskUse:true }, function(error, appUsersDbResult) {
814814

815-
if (plugins.getConfig("api").metric_changes && shortcodesForMetrics[metric]) {
815+
if (plugins.getConfig("api", params.app && params.app.plugins, true).metric_changes && shortcodesForMetrics[metric]) {
816816

817817
var metricChangesMatch = {
818818
ts: countlyCommon.getTimestampRangeQuery(params, true)
@@ -1145,7 +1145,7 @@ var fetch = {},
11451145
//truncate large meta on refresh
11461146
if (isRefresh) {
11471147
for(var i in mergedDataObj['meta']){
1148-
if(mergedDataObj['meta'][i].length > plugins.getConfig("api").metric_limit && plugins.getConfig("api").metric_limit != 0)
1148+
if(mergedDataObj['meta'][i].length > plugins.getConfig("api", params.app && params.app.plugins, true).metric_limit && plugins.getConfig("api", params.app && params.app.plugins, true).metric_limit != 0)
11491149
delete mergedDataObj['meta'][i];
11501150
}
11511151
}

‎api/parts/data/usage.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ var usage = {},
194194
var dbAppUser = params.app_user
195195
if(dbAppUser){
196196
var lastTs = dbAppUser[common.dbUserMap['last_end_session_timestamp']] || dbAppUser[common.dbUserMap['last_begin_session_timestamp']];
197-
if (!lastTs || (params.time.timestamp - lastTs) > plugins.getConfig("api").session_cooldown) {
197+
if (!lastTs || (params.time.timestamp - lastTs) > plugins.getConfig("api", params.app && params.app.plugins, true).session_cooldown) {
198198
//process duration from unproperly ended previous session
199199
plugins.dispatch("/session/post", {params:params, dbAppUser:dbAppUser, end_session:false});
200200
if (dbAppUser && dbAppUser[common.dbUserMap['session_duration']]) {
@@ -217,7 +217,7 @@ var usage = {},
217217

218218
usage.endUserSession = function (params, done) {
219219
//check if end_session is not too old and ignore if it is
220-
if(params.time.timestamp >= params.time.nowWithoutTimestamp.unix() - plugins.getConfig("api").session_duration_limit){
220+
if(params.time.timestamp >= params.time.nowWithoutTimestamp.unix() - plugins.getConfig("api", params.app && params.app.plugins, true).session_duration_limit){
221221
// As soon as we receive the end_session we set the timestamp
222222
// This timestamp is used inside processUserSession
223223
var userProps = {};
@@ -289,8 +289,8 @@ var usage = {},
289289
session_duration = parseInt(params.qstring.session_duration);
290290

291291
if (session_duration == (session_duration | 0)) {
292-
if (plugins.getConfig("api").session_duration_limit && session_duration > plugins.getConfig("api").session_duration_limit) {
293-
session_duration = plugins.getConfig("api").session_duration_limit;
292+
if (plugins.getConfig("api", params.app && params.app.plugins, true).session_duration_limit && session_duration > plugins.getConfig("api", params.app && params.app.plugins, true).session_duration_limit) {
293+
session_duration = plugins.getConfig("api", params.app && params.app.plugins, true).session_duration_limit;
294294
}
295295

296296
if (session_duration < 0) {
@@ -360,7 +360,7 @@ var usage = {},
360360
}
361361

362362
// We check if city data logging is on and user's country is the configured country of the app
363-
if (tmpMetric.name == "city" && (plugins.getConfig("api").city_data === false || params.app_cc != params.user.country)) {
363+
if (tmpMetric.name == "city" && (plugins.getConfig("api", params.app && params.app.plugins, true).city_data === false || params.app_cc != params.user.country)) {
364364
continue;
365365
}
366366

@@ -482,7 +482,7 @@ var usage = {},
482482
// current begin_session request and mark this user as having an ongoing session
483483
var lastEndSession = dbAppUser[common.dbUserMap['last_end_session_timestamp']];
484484

485-
if (!params.qstring.ignore_cooldown && lastEndSession && (params.time.timestamp - lastEndSession) < plugins.getConfig("api").session_cooldown) {
485+
if (!params.qstring.ignore_cooldown && lastEndSession && (params.time.timestamp - lastEndSession) < plugins.getConfig("api", params.app && params.app.plugins, true).session_cooldown) {
486486
plugins.dispatch("/session/extend", {params:params});
487487

488488
var userProps = {};
@@ -669,7 +669,7 @@ var usage = {},
669669

670670
var dateIds = common.getDateIds(params);
671671
var metaToFetch = {};
672-
if(plugins.getConfig("api").metric_limit > 0){
672+
if(plugins.getConfig("api", params.app && params.app.plugins, true).metric_limit > 0){
673673
for (var i=0; i < predefinedMetrics.length; i++) {
674674
for (var j=0; j < predefinedMetrics[i].metrics.length; j++) {
675675
var tmpMetric = predefinedMetrics[i].metrics[j],
@@ -682,7 +682,7 @@ var usage = {},
682682
}
683683

684684
// We check if city data logging is on and user's country is the configured country of the app
685-
if (tmpMetric.name == "city" && (plugins.getConfig("api").city_data === false || params.app_cc != params.user.country)) {
685+
if (tmpMetric.name == "city" && (plugins.getConfig("api", params.app && params.app.plugins, true).city_data === false || params.app_cc != params.user.country)) {
686686
continue;
687687
}
688688

@@ -740,7 +740,7 @@ var usage = {},
740740
}
741741

742742
// We check if city data logging is on and user's country is the configured country of the app
743-
if (tmpMetric.name == "city" && (plugins.getConfig("api").city_data === false || params.app_cc != params.user.country)) {
743+
if (tmpMetric.name == "city" && (plugins.getConfig("api", params.app && params.app.plugins, true).city_data === false || params.app_cc != params.user.country)) {
744744
continue;
745745
}
746746

@@ -757,7 +757,7 @@ var usage = {},
757757
if(metas[tmpZeroId] &&
758758
metas[tmpZeroId][tmpMetric.set] &&
759759
Object.keys(metas[tmpZeroId][tmpMetric.set]).length &&
760-
Object.keys(metas[tmpZeroId][tmpMetric.set]).length >= plugins.getConfig("api").metric_limit &&
760+
Object.keys(metas[tmpZeroId][tmpMetric.set]).length >= plugins.getConfig("api", params.app && params.app.plugins, true).metric_limit &&
761761
typeof metas[tmpZeroId][tmpMetric.set][escapedMetricVal] === "undefined"){
762762
ignore = true;
763763
}
@@ -854,7 +854,7 @@ var usage = {},
854854
855855
{ "uid" : "1", "ts" : 1463778143, "d" : { "o" : "iPhone1", "n" : "iPhone2" }, "av" : { "o" : "1:0", "n" : "1:1" } }
856856
*/
857-
if (plugins.getConfig("api").metric_changes && metricChanges.uid && !params.app_user.mt) {
857+
if (plugins.getConfig("api", params.app && params.app.plugins, true).metric_changes && metricChanges.uid && !params.app_user.mt) {
858858
common.db.collection('metric_changes' + params.app_id).insert(metricChanges);
859859
}
860860
}

‎api/utils/common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ var common = {},
15681568
update["$set"].did = params.qstring.device_id;
15691569
}
15701570

1571-
if(plugins.getConfig("api").prevent_duplicate_requests && user.last_req !== params.request_hash){
1571+
if(plugins.getConfig("api", params.app && params.app.plugins, true).prevent_duplicate_requests && user.last_req !== params.request_hash){
15721572
if(!update["$set"])
15731573
update["$set"] = {};
15741574
update["$set"].last_req = params.request_hash;

0 commit comments

Comments
 (0)