<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> This PR Fixes a bug where logging shows a truncated command instead of the original one.
Original query in .cfg: `sql_query("ca", "UPDATE dialog SET timeout = timeout + 1 WHERE callid = '$ci' AND timeout > 0;`
logged error before fix:
sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al@there]
logged error after fix:
sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al@there.com AND timeout > 0;] You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3903
-- Commit Summary --
* sqlops: Don't truncated sql command when logging.
-- File Changes --
M src/modules/sqlops/sql_api.c (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3903.patch https://github.com/kamailio/kamailio/pull/3903.diff
It is not a bug, it was done on purpose to limit the size of logging message, because there can be rather long queries some time and can fill the logs or slow down. If you find 64 too short, you can eventually double it. Alternative you can add a modparam to set the max length to be printed.
Hmm, ok. Seems fair but it's not documented anywhere and it can lead to misunderstanding that the query itself is truncated and producing the error.
Maybe the modparam limit is the best way to go but is it worth it to be introduced just for this logging?
@xkaraman pushed 1 commit.
6874950f5c516c9702c46d9e918e0de79888aa55 sqlops: Add log_buf_size param for logging raw queries.
I added a modparam to control the max length printed when logging raw queries. I also updated the docs.
It can be merged.
Merged #3903 into master.