Skip to content

Commit

Permalink
release 1.0.2 - Making logging work when using EasyMySQL.connect_with…
Browse files Browse the repository at this point in the history
…_pool()
  • Loading branch information
BryanDonovan committed Aug 15, 2013
1 parent 71187c9 commit f2e77cd
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
3 changes: 3 additions & 0 deletions History.md
Expand Up @@ -30,3 +30,6 @@

- 1.0.1
Adding ability to add a logger to log errors returned from MySQL.

- 1.0.2
Making logging work when using EasyMySQL.connect_with_pool().
9 changes: 7 additions & 2 deletions lib/easy_mysql.js
Expand Up @@ -282,8 +282,13 @@ EasyMySQL.connect_with_easy_pool = function (settings) {
*
* var easy_mysql = EasyMySQL.connect_with_pool(pool);
*/
EasyMySQL.connect_with_pool = function (pool) {
return new EasyMySQL({pool: pool});
EasyMySQL.connect_with_pool = function (pool, settings) {
var args = {};
if (settings) {
args = settings;
}
args.pool = pool;
return new EasyMySQL(args);
};

exports.connect = EasyMySQL.connect;
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "easy-mysql",
"description": "Light MySQL query wrapper with connection pooling.",
"version": "1.0.1",
"version": "1.0.2",
"author": "MOG, Inc.",
"contributors": [
{"name": "Bryan Donovan"}
Expand Down
13 changes: 13 additions & 0 deletions test/easy_mysql.unit.js
Expand Up @@ -270,6 +270,19 @@ describe('EasyMySQL', function () {
setup_db(done);
});

it("lets us specify a logger in settings", function () {
var pool = easy_pool.fetch(settings.db1);
var logging = {
logger: common.fake_logger,
events: {
error: {level: 'warn'}
}
};

easy_mysql = EasyMySQL.connect_with_pool(pool, {logging: logging});
assert.ok(easy_mysql.logging);
});

describe("EasyMysql.connect_with_pool", function () {
it("lets us execute queries", function (done) {
var pool = easy_pool.fetch(settings.db1);
Expand Down

0 comments on commit f2e77cd

Please sign in to comment.