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] Add autocommit options to mysql; Fix bug 76048

Browse Source
This commit is contained in:
Sergey Konovalov
2025-07-21 19:23:13 +03:00
parent 890deabb8d
commit 0bd2de354d
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/config/default.json
View File

@ -398,7 +398,8 @@
},
"mysqlExtraOptions": {
"connectTimeout": 60000,
"queryTimeout": 60000
"queryTimeout": 60000,
"autoCommit": false
}
},
"redis": {

16
DocService/sources/databaseConnectors/mysqlConnector.js
View File

@ -34,6 +34,7 @@
const mysql = require('mysql2/promise');
const connectorUtilities = require('./connectorUtilities');
const operationContext = require('../../../Common/sources/operationContext');
const config = require('config');
const configSql = config.get('services.CoAuthoring.sql');
@ -58,9 +59,24 @@ if (configuration.queryTimeout) {
queryTimeout = configuration.queryTimeout;
delete configuration.queryTimeout;
}
let autoCommit = false;
if (configuration.autoCommit !== undefined) {
//delete to fix issue with invalid configuration option
autoCommit = configuration.autoCommit;
delete configuration.autoCommit
}
const pool = mysql.createPool(configuration);
// Set autocommit once per connection
if (autoCommit === true) {
pool.on('connection', async (conn) => {
conn.promise().query('SET autocommit=1').catch(err =>
operationContext.global.logger.error('Failed to set autocommit=1:', err.message)
);
});
}
function sqlQuery(ctx, sqlCommand, callbackFunction, opt_noModifyRes = false, opt_noLog = false, opt_values = []) {
return executeQuery(ctx, sqlCommand, opt_values, opt_noModifyRes, opt_noLog).then(
result => callbackFunction?.(null, result),