From 2dc6b3454e6fd1f127b76fb83e30e6d760ab310f Mon Sep 17 00:00:00 2001 From: adi Date: Wed, 11 Jan 2023 17:54:31 +0200 Subject: [PATCH] updated freeswitch doc + revert changes in drv --- apis/filter_indexes_it_test.go | 1 + docs/tut_freeswitch_installs.rst | 14 ++++++++++---- engine/storage_internal_datadb.go | 6 ++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/apis/filter_indexes_it_test.go b/apis/filter_indexes_it_test.go index 78a0edd1b..df8f260ba 100644 --- a/apis/filter_indexes_it_test.go +++ b/apis/filter_indexes_it_test.go @@ -57,6 +57,7 @@ var ( testV1FIdxAttributeComputeIndexes, testV1FIdxAttributeMoreProfilesForFilters, testV1FIdxAttributeSRemoveComputedIndexesIDs, + testV1IndexClearCache, testV1FIdxAttributeRemoveIndexesComputeIndexesAllProfiles, testV1FIdxAttributesRemoveProfilesNoIndexes, diff --git a/docs/tut_freeswitch_installs.rst b/docs/tut_freeswitch_installs.rst index b6d4c4320..849442842 100644 --- a/docs/tut_freeswitch_installs.rst +++ b/docs/tut_freeswitch_installs.rst @@ -16,16 +16,22 @@ FreeSWITCH_ More information regarding the installation of FreeSWITCH_ on Debian can be found on it's official `installation wiki `_. +Firstly, in order to install FreeSWITCH_, the authentication is required by creating a SignalWire Personal Access Token. Before instalation, it's needed to generate the personal token and this cand be found on :ref:`SignalWire official wiki in creating a personal token`. + To get FreeSWITCH_ installed and configured, we have choosen the simplest method, out of *vanilla* packages, plus one individual module we need: *mod-json-cdr*. We will install FreeSWITCH_ via following commands: :: + TOKEN=YOURSIGNALWIRETOKEN # here insert your SignalWire Personal Acces Token + wget --http-user=signalwire --http-password=$TOKEN -O /usr/share/keyrings/signalwire-freeswitch-repo.gpg https://freeswitch.signalwire.com/repo/deb/debian-release/signalwire-freeswitch-repo.gpg + echo "machine freeswitch.signalwire.com login signalwire password $TOKEN" > /etc/apt/auth.conf + chmod 600 /etc/apt/auth.conf + echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ `lsb_release -sc` main" > /etc/apt/sources.list.d/freeswitch.list + echo "deb-src [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ `lsb_release -sc` main" >> /etc/apt/sources.list.d/freeswitch.list - wget -O - http://files.freeswitch.org/repo/deb/freeswitch-1.6/key.gpg |apt-key add - - echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list - apt-get update - apt-get install freeswitch-meta-vanilla freeswitch-mod-json-cdr libyuv-dev + # if /etc/freeswitch does not exist, the standard vanilla configuration is deployed + apt-get update && apt-get install -y freeswitch-meta-allapt-get update && apt-get install -y freeswitch-meta-all Once installed, we will proceed with loading the configuration out of specific tutorial cases bellow. diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index 195948a4b..3ea2e0397 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -599,6 +599,12 @@ func (iDB *InternalDB) SetIndexesDrv(_ *context.Context, idxItmType, tntCtx stri true, utils.NonTransactional) continue } + //to be the same as HMSET + if transactionID != utils.EmptyString { + if x, ok := iDB.db.Get(idxItmType, dbKey); ok && x != nil { + indx = utils.JoinStringSet(indx, x.(utils.StringSet)) + } + } iDB.db.Set(idxItmType, dbKey, indx, []string{tntCtx}, true, utils.NonTransactional) }