Skip to content

Adds 'connection' to postgres connection user callback #249

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

Draft
vinnyjth wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Adds 'connection' to postgres connection user callback #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3daece5
Add 'connection' to postgres user callback
vinnyjth Oct 11, 2020
fedc41d
Ensure we send the connection w/ an invalid callback as well
vinnyjth Oct 11, 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
6 changes: 3 additions & 3 deletions dist/lib/integrations/pg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ class PGIntegration extends integrations_1.RequireIntegration {
// If a callback was specified we need to do callback version
if (userCallback) {
return originalConnectFn.apply(this, [
err => {
(err, connection) => {
if (err) {
integration.logFn("[scout/integrations/pg] Connection to Postgres db failed", types_1.LogLevel.Trace);
userCallback(err);
userCallback(err, connection);
return;
}
userCallback();
userCallback(undefined, connection);
},
]);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/integrations/pg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ export class PGIntegration extends RequireIntegration {
const originalConnectFn = Client.prototype.connect;
const integration = this;

const fn: any = function(this: Client, userCallback?: (err?: Error) => void) {
const fn: any = function(this: Client, userCallback?: (err?: Error, connection?: any) => void) {
integration.logFn("[scout/integrations/pg] Connecting to Postgres db...", LogLevel.Trace);

// If a callback was specified we need to do callback version
if (userCallback) {
return originalConnectFn.apply(this, [
err => {
(err, connection) => {
if (err) {
integration.logFn(
"[scout/integrations/pg] Connection to Postgres db failed",
LogLevel.Trace,
);
userCallback(err);
userCallback(err, connection);
return;
}
userCallback();
userCallback(undefined, connection);
},
]);
}
Expand Down