fix: catch error

Author: cuyl

lib/connection.js

@@ -12,9 +12,11 @@ class Connection {
         return result;
       } catch (err) {
         this.log.error(err.message);
-        const error = await this.close();
-        if (error) {
-          throw error;
+        try {
+          await this.close();
+        } catch (closeError) {
+          this.log.error(closeError.message);
+          throw closeError;
         }
         throw err;
       }

lib/oracle.js

@@ -26,11 +26,14 @@ class OracleDB {
       return this.pool.getConnection();
     } catch (err) {
       this.log.error(err.message);
-      const error = await this.pool.close();
-      if (error) {
-        throw error;
+      try {
+        await this.pool.close();
+      } catch (closeError) {
+        this.log.error(closeError.message);
+        this.pool = await oracledb.createPool(this.config);
+        throw closeError;
       }
-      this.pool = await oracledb.createPool(this.config);
+      throw err;
     }
   }
   async getConnection() {
@@ -39,11 +42,14 @@ class OracleDB {
       return new Connection(connection, this.log);
     } catch (err) {
       this.log.error(err.message);
-      const error = await this.pool.close();
-      if (error) {
-        throw error;
+      try {
+        await this.pool.close();
+      } catch (closeError) {
+        this.log.error(closeError.message);
+        this.pool = await oracledb.createPool(this.config);
+        throw closeError;
       }
-      this.pool = await oracledb.createPool(this.config);
+      throw err;
     }
   }
   /**
@@ -63,11 +69,12 @@ class OracleDB {
         return result;
       } catch (err) {
         this.log.error(err.message);
-        const error = await connection.close();
-        if (error) {
-          throw error;
+        try {
+          await connection.close();
+        } catch (error) {
+          this.log.error(error.message);
+          this.connection = await this._getConnection();
         }
-        this.connection = await this._getConnection();
         throw err;
       }
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg-oracle",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Oracle database plugin for egg",
   "eggPlugin": {
     "name": "oracle"