db-cluster-controller
Advanced tools
Comparing version 1.0.1 to 1.1.0
48
index.js
@@ -5,3 +5,3 @@ "use strict"; | ||
module.exports = function(clusterConfig, structureString, dataArray) { | ||
module.exports = function (clusterConfig, structureString, dataArray) { | ||
@@ -21,6 +21,12 @@ let cfg = { | ||
return { | ||
setup: function(cb) { | ||
setup: (...args) => { | ||
let cb, data; | ||
cb = args.pop(); | ||
data = args.pop(); | ||
if (data) { | ||
dataArray = data; | ||
} | ||
cluster = require('db-cluster')(cfg); | ||
cluster_real = require('db-cluster')(clusterConfig); | ||
cluster.master(function(err, conn) { | ||
cluster.master(function (err, conn) { | ||
if (err) { | ||
@@ -32,7 +38,7 @@ return cb(err); | ||
let tasks = [ | ||
function(asyncCB) { | ||
function (asyncCB) { | ||
asyncCB(null, conn); | ||
}, | ||
function(conn, asyncCB) { | ||
conn.query('DROP DATABASE IF EXISTS ??', [dbname], function(err, result) { | ||
function (conn, asyncCB) { | ||
conn.query('DROP DATABASE IF EXISTS ??', [dbname], function (err, result) { | ||
if (err) { | ||
@@ -45,4 +51,4 @@ asyncCB(err); | ||
}, | ||
function(conn, asyncCB) { | ||
conn.query('CREATE DATABASE ??', [dbname], function(err, result) { | ||
function (conn, asyncCB) { | ||
conn.query('CREATE DATABASE ??', [dbname], function (err, result) { | ||
if (err) { | ||
@@ -68,7 +74,7 @@ asyncCB(err); | ||
async.waterfall(tasks, function(err, result) { | ||
if(err) { | ||
async.waterfall(tasks, function (err, result) { | ||
if (err) { | ||
return cb(err); | ||
} | ||
cluster_real.master(function(err, conn) { | ||
cluster_real.master(function (err, conn) { | ||
if (err) { | ||
@@ -84,6 +90,6 @@ return cb(err); | ||
); | ||
if(dataArray) { | ||
if (dataArray) { | ||
mocker.make(clone(dataArray)); | ||
} | ||
mocker.run(function(err) { | ||
mocker.run(function (err) { | ||
cb(err); | ||
@@ -95,10 +101,10 @@ }) | ||
}, | ||
shutdown: function(cb, wrapper) { | ||
realConn.release(function(err) { | ||
cluster.end(function(err) { | ||
if(err) { | ||
shutdown: function (cb, wrapper) { | ||
realConn.release(function (err) { | ||
cluster.end(function (err) { | ||
if (err) { | ||
return cb(err); | ||
} | ||
internalConn.release(function() { | ||
cluster_real.end(function(err) { | ||
internalConn.release(function () { | ||
cluster_real.end(function (err) { | ||
cb(err); | ||
@@ -111,4 +117,4 @@ }) | ||
teardown: function(cb, wrapper) { | ||
if(!realConn) { | ||
teardown: function (cb, wrapper) { | ||
if (!realConn) { | ||
return cb(); | ||
@@ -115,0 +121,0 @@ } |
{ | ||
"name": "db-cluster-controller", | ||
"version": "1.0.1", | ||
"version": "1.1.0", | ||
"description": "A small controller to create, shutdown and destory db-cluster databases", | ||
@@ -18,6 +18,6 @@ "main": "index.js", | ||
"devDependencies": { | ||
"db-cluster-mysql": "^0.0.7", | ||
"mocha": "^4.0.1", | ||
"db-cluster-mysql": "^0.0.8", | ||
"mocha": "^5.0.1", | ||
"mysql": "^2.15.0" | ||
} | ||
} |
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
264
11647
6
1