Merge branch 'master' of https://github.com/Countly/countly-server

Author: ar2rsawseen

README.md

@@ -1,6 +1,6 @@
 #Countly [![Build Status](https://api.travis-ci.org/Countly/countly-server.png?branch=master)](https://travis-ci.org/Countly/countly-server) [![Install Countly on DigitalOcean](http://do.count.ly/button.svg?v2)](http://do.count.ly)
 
-**We're hiring:** Countly is looking for full stack node.js developers to work on its core platform. [Click this link for job description](https://count.ly/full-stack-node-js-developer/)
+**We're hiring:** Countly is looking for full stack node.js developers (from China and world, for remote work) to develop on  Countly platform. [Click this link for job description](https://count.ly/full-stack-node-js-developer/)
 
 **Are you a plugin developer?** [Contact us](http://count.ly/contact-us) if you like to work / working on a specific [plugin](http://count.ly/plugins) and we can discuss details on how we can work together in a lively environment!
 

plugins/push/api/parts/lib/connection.js

@@ -185,7 +185,7 @@ Cluster.prototype.send = function(messageId, content, encoding, expiry, device,
 };
 
 Cluster.prototype.wow = function(){
-	if (((this.queue.length + this.countAllConnections()) > DEFAULTS.queue) || this.profiler.cpu.value > DEFAULTS.profilerMaxCPU) {
+	if (((this.queue.length + this.countAllConnections()) > DEFAULTS.queue) || (!this.profiler.closed && this.profiler.cpu.value > DEFAULTS.profilerMaxCPU)) {
 		return 'such no power much sad';
 	} else {
 		return 'much happy so message';

plugins/push/api/parts/lib/constants.js

@@ -79,9 +79,9 @@ exports = module.exports = {
 			/** Allow transmitAtOnce to change until eventLoopDelayToThrottleDown is met */
 			transmitAtOnceAdjusts: true,
 			/** If adjusts, for how much tops (HTTP/2 streams) */
-			transmitAtOnceMaxAdjusted: 400,
+			transmitAtOnceMaxAdjusted: 300,
 			/** How much simultaneous requests can be in processing */
-			maxRequestsInFlight: 899,
+			maxRequestsInFlight: 699,
 			/** How much certificates to hold in memory instead of reading from file */
 			certificatesCache: 50,
 			/** Keep no more than 50000 messages per connection in memory. Whenever sending is slower than messages stream,

plugins/push/api/parts/lib/http.js

@@ -174,7 +174,7 @@ HTTP.prototype.waitAndClose = function(clb) {
 	if (this.notesInFlight <= 0 || this.closeAttempts > 30) {
 		this.closeAttempts = 100;
 
-		log.d('Wating 10 seconds before closing connection (%d notes in flight, %d in queue)', this.notesInFlight, this.notifications.length);
+		log.d('Wating 50 seconds before closing connection (%d notes in flight, %d in queue)', this.notesInFlight, this.notifications.length);
 		setTimeout(() => {
 			log.d('Finally closing this connection (%d notes in flight, %d in queue)', this.notesInFlight, this.notifications.length);
 			if (this.socket) {
@@ -200,7 +200,7 @@ HTTP.prototype.waitAndClose = function(clb) {
 				setTimeout(clb.bind(null, arr.length ? arr : undefined), 10);
 			}
 			this.emit(EVENTS.CLOSED);
-		}, 10000);
+		}, 50000);
 	} else {
 		log.d('Not emiting closed event yet - %d notes are in flight, %d in queue', this.notesInFlight, this.notifications.length);
 		this.closeAttempts = this.closeAttempts ? ++this.closeAttempts : 1;