Skip to content

Test _sql & _conn before searching for fields/methods within them #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajoslin103 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Test _sql & _conn before searching for fields/methods within them #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d9d78b
Test _sql & _conn before searching for fields/methods within them whe…
ajoslin103 Feb 28, 2020
3a0a6c4
Update mysql.js
ajoslin103 Mar 6, 2020
6e5583f
Update package.json
ajoslin103 Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions mysql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* @author David Spreekmeester <david@grrr.nl>
*/

const mysql = require('mysql2')
const Client = require('ssh2').Client;
const mysql = require('mysql2')
const Client = require('ssh2').Client;

var tunnel = module.exports = {

Expand All @@ -23,11 +23,11 @@ var tunnel = module.exports = {
* @param obj dbConfig MySQL Configuration as defined by mysql(2) package
* @return Promise <mysql2 connection>
*/
connect: function(sshConfig, dbConfig) {
connect: function (sshConfig, dbConfig) {
dbConfig = tunnel._addDefaults(dbConfig)
return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
tunnel._conn = new Client();
tunnel._conn.on('ready', function() {
tunnel._conn.on('ready', function () {
tunnel._conn.forwardOut(
'127.0.0.1',
12345,
Expand All @@ -54,15 +54,25 @@ var tunnel = module.exports = {
})
},

close: function() {
if ('end' in tunnel._sql) {
tunnel._sql.end(function(err) {})
}
close: function () {
try {
if ('end' in tunnel._sql) {
tunnel._sql.end(function (err) {
if (err) { throw new Error(err); }
})
}
} catch (error) {
console.log(`error closing mysql connection: ${error.message}`);
}

if ('end' in tunnel._conn) {
tunnel._conn.end()
}
},
try {
if ('end' in tunnel._conn) {
tunnel._conn.end()
}
} catch (error) {
console.log(`error closing ssh connection: ${error.message}`);
}
},

_addDefaults(dbConfig) {
if (!('port' in dbConfig)) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ssh2": "^0.5.4"
},
"name": "mysql-ssh",
"version": "1.0.6",
"version": "1.0.7",
"description": "Execute mysql commands over an ssh tunnel.",
"main": "mysql.js",
"devDependencies": {},
Expand Down