Module: kamailio
Branch: master
Commit: c23104bd16c8b1df983e434dc6017a69bf586604
URL: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2022-01-20T16:31:20+01:00
modules: readme files regenerated - uac ... [skip ci]
---
Modified: src/modules/uac/README
---
Diff: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6…
Patch: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6…
---
diff --git a/src/modules/uac/README b/src/modules/uac/README
index ba2f50461e..5fe4071d56 100644
--- a/src/modules/uac/README
+++ b/src/modules/uac/README
@@ -1295,7 +1295,7 @@ event_route[uac:reply] {
* contact_addr - contact address to be used for this record instead
of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It
- can be set to '.' (dot) to skip setting it and then
+ can be set to '' (empty string) to skip setting it and then
reg_contact_addr modparam is used.
* socket - Used socket for sending out registration requests, e.g.:,
Module: kamailio
Branch: master
Commit: 8014638fb8a3653868684d00df7dfb8e3f13eb33
URL: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8…
Author: Henning Westerholt <hw(a)gilawa.com>
Committer: Henning Westerholt <hw(a)gilawa.com>
Date: 2022-01-20T15:16:39Z
uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot
---
Modified: src/modules/uac/doc/uac_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8…
Patch: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8…
---
diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml
index b6184a6daa..188d1b913e 100644
--- a/src/modules/uac/doc/uac_admin.xml
+++ b/src/modules/uac/doc/uac_admin.xml
@@ -1619,7 +1619,7 @@ event_route[uac:reply] {
<listitem><para>
<emphasis>contact_addr</emphasis> - contact address to be used for this record
instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can
- be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used.
+ be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used.
</para></listitem>
</itemizedlist>
<itemizedlist>
Module: kamailio
Branch: master
Commit: ca3b5f3ca581c4327d6b02342773fed47ea82ee2
URL: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2022-01-20T12:31:24+01:00
modules: readme files regenerated - db_redis ... [skip ci]
---
Modified: src/modules/db_redis/README
---
Diff: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed…
Patch: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed…
---
diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README
index ef76592a83..ab56c61379 100644
--- a/src/modules/db_redis/README
+++ b/src/modules/db_redis/README
@@ -178,6 +178,11 @@ allid,time_hires&cid:callid
running Kamailio with this module loaded:
* hiredis - available at https://github.com/redis/hiredis
+ The following library is an optional dependency to support redis
+ cluster protocol:
+ * hiredis-cluster - available at
+ https://github.com/Nordix/hiredis-cluster
+
4. Parameters
4.1. schema_path (string)
@@ -227,6 +232,10 @@ modparam("db_redis", "verbosity", 0)
'redis://[username]@host:port/database'. Username is optional. The
database portion must be a valid Redis database number.
+ For cluster support you need to set the "db_url" modparam with a comma
+ separated list of cluster hosts: 'redis://host1:port1,host2:port2/'.
+ The database portion is not supported in cluster mode.
+
Example 1.4. Usage
...
loadmodule "db_redis.so"
<!-- 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
- [x] Related to issue #2977
#### Description
Add support for redis cluster protocol via hiredis-cluster library to db_redis module
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2995
-- Commit Summary --
* db_redis: added hiredis-cluster detection
* db_redis: use cluster api
* db_redis: update documentation
-- File Changes --
M src/modules/db_redis/Makefile (14)
M src/modules/db_redis/doc/db_redis_admin.xml (15)
M src/modules/db_redis/redis_connection.c (115)
M src/modules/db_redis/redis_connection.h (34)
M src/modules/db_redis/redis_dbase.c (135)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2995.patchhttps://github.com/kamailio/kamailio/pull/2995.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2995
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/2995(a)github.com>
Module: kamailio
Branch: master
Commit: 610603da5fb45eeffba2f7d623f50b358e65d6ed
URL: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3…
Author: Riccardo Villa <riccardo.villa(a)netaxis.be>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2022-01-20T12:30:22+01:00
db_redis: update documentation
---
Modified: src/modules/db_redis/doc/db_redis_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3…
Patch: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3…
---
diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml
index 6439c79b6f..b3b54c08a2 100644
--- a/src/modules/db_redis/doc/db_redis_admin.xml
+++ b/src/modules/db_redis/doc/db_redis_admin.xml
@@ -146,6 +146,17 @@ location=entry:ruid&usrdom:username,domain&timer:partition,keepalive;acc
</listitem>
</itemizedlist>
</para>
+ <para>
+ The following library is an optional dependency to support redis cluster protocol:
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>hiredis-cluster</emphasis> - available at
+ <ulink url="https://github.com/Nordix/hiredis-cluster">https://github.com/Nordix/hiredis-cluster</ulink>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
</section>
</section>
@@ -216,6 +227,10 @@ modparam("db_redis", "verbosity", 0)
'redis://[username]@host:port/database'. Username is optional.
The database portion must be a valid Redis database number.
</para>
+ <para>
+ For cluster support you need to set the "db_url" modparam with a comma separated list of cluster hosts:
+ 'redis://host1:port1,host2:port2/'. The database portion is not supported in cluster mode.
+ </para>
<example>
<title>Usage</title>
<programlisting format="linespecific">