Skip to content

Commit 7293c2e

Browse files
authored
fix: fix mysql2 invalid configuration option poolWaitTimeout (#8)
Unpicked `options` will become `mysqlOptions` and pass to mysql2, mean while mysql2 will console.error a message, causing egg fail to start. ![image](https://github.com/user-attachments/assets/19bb92fa-1c98-4e7b-8195-5cf7ff303e1d) ![image](https://github.com/user-attachments/assets/88108c2b-ef9e-4c34-b74b-93cb609101b3) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced configurability of the RDSClient by adding a `poolWaitTimeout` option for improved connection management. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent b359064 commit 7293c2e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/client.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class RDSClient extends Operator {
6767
constructor(options: RDSClientOptions) {
6868
super();
6969
options.connectTimeout = options.connectTimeout ?? 500;
70-
const { connectionStorage, connectionStorageKey, ...mysqlOptions } = options;
70+
const { connectionStorage, connectionStorageKey, poolWaitTimeout, ...mysqlOptions } = options;
7171
// get connection options from getConnectionConfig method every time
7272
if (mysqlOptions.getConnectionConfig) {
7373
this.#pool = new Pool({ config: new RDSPoolConfig(mysqlOptions, mysqlOptions.getConnectionConfig) } as any) as unknown as PoolPromisify;
@@ -83,7 +83,7 @@ export class RDSClient extends Operator {
8383
});
8484
this.#connectionStorage = connectionStorage || new AsyncLocalStorage();
8585
this.#connectionStorageKey = connectionStorageKey || RDSClient.#DEFAULT_STORAGE_KEY;
86-
this.#poolWaitTimeout = options.poolWaitTimeout ?? 500;
86+
this.#poolWaitTimeout = poolWaitTimeout ?? 500;
8787
// https://github.com/mysqljs/mysql#pool-events
8888
this.#pool.on('connection', (connection: PoolConnectionPromisify) => {
8989
channels.connectionNew.publish({

0 commit comments

Comments
 (0)