perf(replication): replication thread optimization

DEgITx · Aug 5, 2018 · c5427a6 · c5427a6
1 parent 015447c
commit c5427a6
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 169 deletions.
diff --git a/src/background/api.js b/src/background/api.js
@@ -7,6 +7,7 @@ const asyncForEach = require('./asyncForEach')
 
 module.exports = async ({
 	sphinx,
+	sphinxSingle,
 	send,
 	recive,
 	p2p,
@@ -207,8 +208,12 @@ module.exports = async ({
 		p2p.on('randomTorrents', (nil, callback) => {
 			if(typeof callback != 'function')
 				return;
-
-			sphinx.query('SELECT * FROM `torrents` ORDER BY rand() limit 5', (error, torrents) => {
+
+			// ignore sql requests on closing
+			if(sphinxSingle.state === 'disconnected')
+				return
+
+			sphinxSingle.query('SELECT * FROM `torrents` ORDER BY rand() limit 5', (error, torrents) => {
 				if(!torrents || torrents.length == 0) {
 					callback(undefined)
 					return;
@@ -222,7 +227,7 @@ module.exports = async ({
 				}
 
 				const inSql = Object.keys(hashes).map(hash => sphinx.escape(hash)).join(',');
-				sphinx.query(`SELECT * FROM files WHERE hash IN(${inSql}) limit 50000`, (error, files) => {
+				sphinxSingle.query(`SELECT * FROM files WHERE hash IN(${inSql}) limit 50000`, (error, files) => {
 					if(!files)
 					{
 						files = []

diff --git a/src/background/mysql.js b/src/background/mysql.js
@@ -122,57 +122,65 @@ const pool = () => {
 	return expand(sphinx)
 }
 
-let mysqlSingle = {
-	_mysql: null
-};
-const proxySingle = new Proxy(mysqlSingle, {
-	get(target, prop) {
-		if(!target[prop])
-		{
-			let ret = target._mysql[prop]
-			if(typeof ret === 'function')
-				ret = ret.bind(target._mysql)
-			return ret
-		}
-		return target[prop]
-	}
-})
 const single = (callback) => {
-	mysqlSingle._mysql = mysql.createConnection({
-		host     : config.sphinx.host,
-		port     : config.sphinx.port
-	});
+	let mysqlSingle = {
+		_mysql: null
+	};
 
-	let promiseResolve;
-	const connectionPromise = new Promise((resolve) => {
-		promiseResolve = resolve
-	})
-	mysqlSingle.waitConnection = () => connectionPromise;
-  
-	mysqlSingle._mysql.connect((mysqlError) => {
-		if (mysqlError) {
-			console.error('error connecting: ' + mysqlError.stack);
-			return;
+	const proxySingle = new Proxy(mysqlSingle, {
+		get(target, prop) {
+			if(!target[prop])
+			{
+				let ret = target._mysql[prop]
+				if(typeof ret === 'function')
+					ret = ret.bind(target._mysql)
+				return ret
+			}
+			return target[prop]
 		}
-
-		if(callback)
-			callback(proxySingle)
+	})
 
-		promiseResolve(proxySingle)
-	});
-
-	mysqlSingle._mysql.on('error', (err) => {
-		console.log('db error', err);
-		if(err.code === 'PROTOCOL_CONNECTION_LOST') { // Connection to the MySQL server is usually
-			mysqlSingle._mysql = undefined
-			single();                         // lost due to either server restart, or a
-		} else {                                      // connnection idle timeout (the wait_timeout
-			throw err;                                  // server variable configures this)
-		}
-	});
+	const start = () =>
+	{
+		mysqlSingle._mysql = mysql.createConnection({
+			host     : config.sphinx.host,
+			port     : config.sphinx.port
+		});
+
+		let promiseResolve;
+		const connectionPromise = new Promise((resolve) => {
+			promiseResolve = resolve
+		})
+		mysqlSingle.waitConnection = () => connectionPromise;
+
+		mysqlSingle._mysql.connect((mysqlError) => {
+			if (mysqlError) {
+				console.error('error connecting: ' + mysqlError.stack);
+				return;
+			}
+
+			if(callback)
+				callback(proxySingle)
+
+			promiseResolve(proxySingle)
+		});
+
+		mysqlSingle._mysql.on('error', (err) => {
+			console.log('db error', err);
+			if(err.code === 'PROTOCOL_CONNECTION_LOST') { // Connection to the MySQL server is usually
+				console.log('restart single sql connection')
+				mysqlSingle._mysql = undefined
+				start();                         // lost due to either server restart, or a
+			} else {                                      // connnection idle timeout (the wait_timeout
+				throw err;                                  // server variable configures this)
+			}
+		});
+
+		mysqlSingle._mysql = expand(mysqlSingle._mysql)
+		return proxySingle
+	}
 
-	mysqlSingle._mysql = expand(mysqlSingle._mysql)
-	return proxySingle
+	return start()
 }
 
 module.exports = {pool, single}