pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Bump oracledb version to fix ORA-01002 error; Wait for connection. close

Browse Source
This commit is contained in:
Sergey Konovalov
2024-01-17 19:57:37 +03:00
parent 186072b239
commit 7866d22b70
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DocService/npm-shrinkwrap.json generated
View File

@ -2657,9 +2657,9 @@
} }
}, },
"oracledb": { "oracledb": {
"version": "6.0.1", "version": "6.3.0",
"resolved": "https://registry.npmjs.org/oracledb/-/oracledb-6.0.1.tgz", "resolved": "https://registry.npmjs.org/oracledb/-/oracledb-6.3.0.tgz",
"integrity": "sha512-N5/Y4IkCFQCumqjEXi3snrclDKjDMMeawq/z/5Ydm5+BxjV3kg9wCaTAp++JTLlCWASb4JMXqK70PctmAkZh3g==" "integrity": "sha512-fr3U66QxgGXb5cs/ozLBQU50TMbZcBQEWvSaj2rJAXG8KRrsZcGOK8JTlZL1yJHeW8cSjOm6n/wTw3SJksGjDg=="
}, },
"packet-reader": { "packet-reader": {
"version": "1.0.0", "version": "1.0.0",

2
DocService/package.json
View File

@ -36,7 +36,7 @@
"multi-integer-range": "4.0.7", "multi-integer-range": "4.0.7",
"multiparty": "4.2.1", "multiparty": "4.2.1",
"mysql2": "2.3.3", "mysql2": "2.3.3",
"oracledb": "6.0.1", "oracledb": "6.3.0",
"pg": "8.8.0", "pg": "8.8.0",
"redis": "4.6.11", "redis": "4.6.11",
"retry": "0.12.0", "retry": "0.12.0",

11
DocService/sources/oracleBaseConnector.js
View File

@ -117,7 +117,16 @@ async function executeQuery(ctx, sqlCommand, values = [], noModifyRes = false, n
throw error; throw error;
} finally { } finally {
connection?.close(); if (connection) {
try {
// Put the connection back in the pool
await connection.close();
} catch (error) {
if (!noLog) {
ctx.logger.error(`connection.close() error while executing query: ${sqlCommand}\n${error.stack}`);
}
}
}
} }
} }