voice-client: fix erros during reload

This commit is contained in:
Sukru Senli 2017-11-01 16:45:03 +01:00
parent 509d9dfca8
commit 1570a91c9c

View file

@ -68,6 +68,7 @@ TMPL_ASTERISK=$TEMPLATEDIR/asterisk.conf.TEMPLATE
TMPL_CDR=$TEMPLATEDIR/cdr.conf.TEMPLATE TMPL_CDR=$TEMPLATEDIR/cdr.conf.TEMPLATE
TMPL_CDR_SYSLOG=$TEMPLATEDIR/cdr_syslog.conf.TEMPLATE TMPL_CDR_SYSLOG=$TEMPLATEDIR/cdr_syslog.conf.TEMPLATE
TMPL_INDICATIONS=$TEMPLATEDIR/indications.conf.TEMPLATE TMPL_INDICATIONS=$TEMPLATEDIR/indications.conf.TEMPLATE
TMPL_CEL=$TEMPLATEDIR/cel.conf.TEMPLATE
TMPL_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE TMPL_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE
TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE
TMPL_MODULES=$TEMPLATEDIR/modules.conf.TEMPLATE TMPL_MODULES=$TEMPLATEDIR/modules.conf.TEMPLATE
@ -80,7 +81,7 @@ TMPL_BRCM_LINE=$TEMPLATEDIR/brcm_line.TEMPLATE
TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE
SPECRATEDIR=$ASTERISKDIR/special_rate_nr.cfg SPECRATECFG=$ASTERISKDIR/special_rate_nr.cfg
run_hook() run_hook()
{ {
@ -113,7 +114,7 @@ compare_configs_and_copy_changed()
{ {
# First, compute md5sums of the config files in $WORKDIR. # First, compute md5sums of the config files in $WORKDIR.
cd $WORKDIR/ cd $WORKDIR/
md5sum * > $MD5SUMSFILE md5sum * > $MD5SUMSFILE 2>/dev/null
# Now, check the files in $ASTERISKDIR against the md5sums. # Now, check the files in $ASTERISKDIR against the md5sums.
cd $ASTERISKDIR/ cd $ASTERISKDIR/
@ -141,15 +142,15 @@ assemble_and_copy_config()
# start if a config item is missing and an included config file isn't created. # start if a config item is missing and an included config file isn't created.
# Copy the template files which we don't edit. # Copy the template files which we don't edit.
cp $TMPL_ASTERISK $WORKDIR/asterisk.conf [ -f $TMPL_ASTERISK ] && cp $TMPL_ASTERISK $WORKDIR/asterisk.conf
cp $TMPL_CDR $WORKDIR/cdr.conf [ -f $TMPL_CDR ] && cp $TMPL_CDR $WORKDIR/cdr.conf
cp $TMPL_CEL $WORKDIR/cel.conf [ -f $TMPL_CEL ] && cp $TMPL_CEL $WORKDIR/cel.conf
cp $TMPL_INDICATIONS $WORKDIR/indications.conf [ -f $TMPL_INDICATIONS ] && cp $TMPL_INDICATIONS $WORKDIR/indications.conf
cp $TMPL_MANAGER $WORKDIR/manager.conf [ -f $TMPL_MANAGER ] && cp $TMPL_MANAGER $WORKDIR/manager.conf
cp $TMPL_MODULES $WORKDIR/modules.conf [ -f $TMPL_MODULES ] && cp $TMPL_MODULES $WORKDIR/modules.conf
cp $TMPL_EXTENSIONS_MACRO $WORKDIR/extensions_macro.conf [ -f $TMPL_EXTENSIONS_MACRO ] && cp $TMPL_EXTENSIONS_MACRO $WORKDIR/extensions_macro.conf
cp $TMPL_MUSICONHOLD $WORKDIR/musiconhold.conf [ -f $TMPL_MUSICONHOLD ] && cp $TMPL_MUSICONHOLD $WORKDIR/musiconhold.conf
cp $SPECRATEDIR $WORKDIR/special_rate_nr.cfg [ -f $SPECRATECFG ] && cp $SPECRATECFG $WORKDIR/special_rate_nr.cfg
test -e $TMPL_MEETME && cp $TMPL_MEETME $WORKDIR/meetme.conf test -e $TMPL_MEETME && cp $TMPL_MEETME $WORKDIR/meetme.conf
@ -1188,8 +1189,8 @@ configure_call_filters()
echo "exten => s,n(not-foreign),Set(FOREIGN=0)" >> $WORKDIR/macros.tmp echo "exten => s,n(not-foreign),Set(FOREIGN=0)" >> $WORKDIR/macros.tmp
echo "" >> $WORKDIR/macros.tmp echo "" >> $WORKDIR/macros.tmp
# Get special rate numbers from /etc/asterisk/special_rate_nr.cfg # Get special rate numbers from /etc/asterisk/special_rate_nr.cfg
if [ -f $SPECRATECFG ]; then
while read line while read line
do do
i=0 i=0
@ -1208,7 +1209,8 @@ configure_call_filters()
# Special rate numbers found # Special rate numbers found
break break
fi fi
done < "/etc/asterisk/special_rate_nr.cfg" done < $SPECRATECFG
fi
echo "Found special rate numbers: $srn" echo "Found special rate numbers: $srn"
@ -2281,6 +2283,8 @@ reload_service() {
# if there is a registered account # if there is a registered account
ubus call led.voice1 set '{"state":"off"}' ubus call led.voice1 set '{"state":"off"}'
asterisk -rx "config reload $ASTERISKDIR/sip.conf"
sleep 1
asterisk -rx "core reload" asterisk -rx "core reload"
asterisk -rx "dialplan reload" asterisk -rx "dialplan reload"
asterisk -rx "brcm reload" asterisk -rx "brcm reload"