```
CC (gcc) [kamailio] core/cfg/cfg.o
CC (gcc) [kamailio] core/utils/srjson.o
CC (gcc) [kamailio] core/utils/sruid.o
CC (gcc) [kamailio] core/utils/tmrec.o
bison -d -b core/cfg core/cfg.y
flex -o core/lex.yy.c core/cfg.lex
CC (gcc) [kamailio] core/lex.yy.o
core/cfg.lex:45:25: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'yy_fatal_error'
static void yynoreturn yy_fatal_error ( const char* msg ) __attribute__((unused));
^
core/cfg.lex:46:25: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'ksr_yy_fatal_error'
static void yynoreturn ksr_yy_fatal_error(const char* msg);
^
core/lex.yy.c: In function 'yylex':
core/lex.yy.c:6389:3: warning: implicit declaration of function 'ksr_yy_fatal_error' [-Wimplicit-function-declaration]
YY_FATAL_ERROR(
^
core/cfg.lex: At top level:
core/cfg.lex:2172:24: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'ksr_yy_fatal_error'
{
^
core/lex.yy.c:7055:13: warning: 'yy_fatal_error' defined but not used [-Wunused-function]
static void yy_fatal_error (yyconst char* msg )
^
make[1]: *** [core/lex.yy.o] Error 1
make: *** [default] Error 2
make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.5.0-dev3/src'
error: Bad exit status from /var/tmp/rpm-tmp.HXxCns (%build)
```
On CentOS7 build properly
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/2631
Module: kamailio
Branch: master
Commit: 3f324e84d4b6f8ac86e72cc63fce2ec9d5eec9e4
URL: https://github.com/kamailio/kamailio/commit/3f324e84d4b6f8ac86e72cc63fce2ec…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-02-09T21:31:11+01:00
modules: readme files regenerated - db_postgres ... [skip ci]
---
Modified: src/modules/db_postgres/README
---
Diff: https://github.com/kamailio/kamailio/commit/3f324e84d4b6f8ac86e72cc63fce2ec…
Patch: https://github.com/kamailio/kamailio/commit/3f324e84d4b6f8ac86e72cc63fce2ec…
---
diff --git a/src/modules/db_postgres/README b/src/modules/db_postgres/README
index 25870ab9e7..88ea8cea62 100644
--- a/src/modules/db_postgres/README
+++ b/src/modules/db_postgres/README
@@ -28,6 +28,7 @@ Greg Fausak
3.3. tcp_keepalive (integer)
3.4. lockset (integer)
3.5. bytea_output_escape (integer)
+ 3.6. con_param (str)
4. Functions
@@ -38,6 +39,7 @@ Greg Fausak
1.3. Set tcp_keepalive parameter
1.4. Set lockset parameter
1.5. Set bytea_output_escape parameter
+ 1.6. Set con_param parameter
Chapter 1. Admin Guide
@@ -56,6 +58,7 @@ Chapter 1. Admin Guide
3.3. tcp_keepalive (integer)
3.4. lockset (integer)
3.5. bytea_output_escape (integer)
+ 3.6. con_param (str)
4. Functions
@@ -89,6 +92,7 @@ Chapter 1. Admin Guide
3.3. tcp_keepalive (integer)
3.4. lockset (integer)
3.5. bytea_output_escape (integer)
+ 3.6. con_param (str)
3.1. retries (integer)
@@ -107,9 +111,11 @@ modparam("db_postgres", "retries", 3)
3.2. timeout (integer)
Setting this variable to any value larger than zero (which is the
- default value) enables both a connection timeout and a query timeout.
- If a connection attempt or a query takes longer than this many seconds,
- the operation will be aborted and an error will be returned.
+ default value) enables mainly query timeout. For backward compatibility
+ it also enables connection timeout if connect_timeout param is not set
+ using the con_param below. If a connection attempt or a query takes
+ longer than this many seconds, the operation will be aborted and an
+ error will be returned.
Note that this timeout is applied to each underlying operation (i.e.
for each connection attempt), so depending on circumstances and on the
@@ -159,6 +165,21 @@ modparam("db_postgres", "lockset", 6)
modparam("db_postgres", "bytea_output_escape", 0)
...
+3.6. con_param (str)
+
+ Specifies the connection string parameters. Parameter definition must
+ be in the format param1=value1;param2=value2. Many parameters can be
+ set.
+
+ NOTE: See postgres connection keyword list
+ (https://www.postgresql.org/docs/12/libpq-connect.html#LIBPQ-PARAMKEYWO
+ RDS)
+
+ Example 1.6. Set con_param parameter
+...
+modparam("db_postgres", "con_param", "connect_timeout=15;tcp_user_timeout=5000")
+...
+
4. Functions
NONE
<!-- 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
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [x] 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 -->
- [ ] 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 -->
New configuration parameter is added to set postgres connection parameters.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2622
-- Commit Summary --
* Merge pull request #1 from kamailio/master
* db_postgres: added connection parameters
-- File Changes --
M src/modules/db_postgres/doc/db_postgres_admin.xml (21)
M src/modules/db_postgres/km_pg_con.c (17)
M src/modules/db_postgres/pg_con.c (18)
M src/modules/db_postgres/pg_mod.c (101)
M src/modules/db_postgres/pg_mod.h (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2622.patchhttps://github.com/kamailio/kamailio/pull/2622.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2622