Merge branch 'master' into l10n_master

1 files changed, 4 insertions, 34 deletions

diff --git a/src/queue/index.ts b/src/queue/index.ts
index 1efd6e54ef..5a48dbe648 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -1,45 +1,15 @@
-import { createQueue } from 'kue';
-
-import config from '../config';
 import http from './processors/http';
 import { ILocalUser } from '../models/user';
 
-const queue = createQueue({
-	redis: {
-		port: config.redis.port,
-		host: config.redis.host,
-		auth: config.redis.pass
-	}
-});
-
-export function createHttp(data: any) {
-	return queue
-		.create('http', data)
-		.removeOnComplete(true)
-		.events(false)
-		.attempts(8)
-		.backoff({ delay: 16384, type: 'exponential' });
+export function createHttpJob(data: any) {
+	return http({ data }, () => {});
 }
 
 export function deliver(user: ILocalUser, content: any, to: any) {
-	createHttp({
-		title: 'deliver',
+	createHttpJob({
 		type: 'deliver',
 		user,
 		content,
 		to
-	}).save();
-}
-
-export default function() {
-	/*
-		256 is the default concurrency limit of Mozilla Firefox and Google
-		Chromium.
-		a8af215e691f3a2205a3758d2d96e9d328e100ff - chromium/src.git - Git at Google
-		https://chromium.googlesource.com/chromium/src.git/+/a8af215e691f3a2205a3758d2d96e9d328e100ff
-		Network.http.max-connections - MozillaZine Knowledge Base
-		http://kb.mozillazine.org/Network.http.max-connections
-	*/
-	//queue.process('http', 256, http);
-	queue.process('http', 128, http);
+	});
 }