pg.Pool 해결 시도

bacchus-snu · Mar 24, 2024 · 6e52380 · 6e52380
1 parent f84e22e
commit 6e52380
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/model/model.ts b/src/model/model.ts
@@ -1,5 +1,6 @@
 import * as Bunyan from 'bunyan';
-import * as pg from 'pg';
+import { DatabaseError, Pool } from 'pg';
+import type { PoolConfig } from 'pg';
 import type Config from '../config.js';
 import EmailAddresses from './email_addresses.js';
 import { ControllableError } from './errors.js';
@@ -25,12 +26,12 @@ export default class Model {
   public readonly hosts: Hosts;
   public readonly oauth: OAuth;
 
-  private readonly pgConfig: pg.PoolConfig;
-  private readonly pgPool: pg.Pool;
+  private readonly pgConfig: PoolConfig;
+  private readonly pgPool: Pool;
 
   constructor(public readonly config: Config, public readonly log: Bunyan) {
     this.pgConfig = config.postgresql;
-    this.pgPool = new pg.Pool(this.pgConfig);
+    this.pgPool = new Pool(this.pgConfig);
 
     this.users = new Users(this);
     this.emailAddresses = new EmailAddresses();
@@ -75,7 +76,7 @@ export default class Model {
         } catch (e) {
           await client.query('ROLLBACK');
 
-          if (e instanceof pg.DatabaseError) {
+          if (e instanceof DatabaseError) {
             if (e.code === PSQL_SERIALIZATION_FAILURE || e.code === PSQL_DEADLOCK_DETECTED) {
               retryCount++;
               if (retryCount < Model.MAX_TRANSACTION_RETRY) {