From 4932ced041d243f64940681922c5f96689f334d0 Mon Sep 17 00:00:00 2001 From: swysor Date: Wed, 4 Oct 2017 22:01:41 +0000 Subject: [PATCH 1/5] added configurable ramdisk definition to prepare() --- system/sbin/kazoo-kamailio | 43 +++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index cd098b3..1bfd1e3 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -26,18 +26,41 @@ if test "$DUMP_CORE" = "yes" ; then fi prepare() { - mkdir -p /var/run/kamailio - chown -R ${USER} /var/run/kamailio - if [ -e ${PID_FILE} ]; then - rm -rf ${PID_FILE} - fi - if [ ! -f /etc/kazoo/kamailio/db/kazoo.db ]; then - KazooDB -init /etc/kazoo/kamailio/kazoodb.sql - fi - chown -R ${USER} /etc/kazoo/kamailio/db - RETVAL=$? + mkdir -p /var/run/kamailio + chown -R ${USER} /var/run/kamailio + if [ -e ${PID_FILE} ]; then + rm -rf ${PID_FILE} + fi + if ram_disk_enabled; then + if ! mount_point_exists; then + if [ -f /etc/kazoo/kamailio/kazoo.db ]; then + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + fi + mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db + if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then + cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ + fi + fi + fi + if [ ! -f /etc/kazoo/kamailio/db/kazoo.db ]; then + KazooDB -init /etc/kazoo/kamailio/kazoodb.sql + fi + chown -R ${USER} /etc/kazoo/kamailio/db + RETVAL=$? +} + +ram_disk_enabled() { + grep -e "^\s*enable_ram_disk\s*=\s*true" /etc/kazoo/kamailio/local.cfg &> /dev/null + return $? } +mount_point_exists() { + mount | grep /etc/kazoo/kamailio/db &> /dev/null + return $? +} + + + start() { cd ${HOME} From 84187b3a9322283e7b0edb7e59f9ba8ad737492b Mon Sep 17 00:00:00 2001 From: swysor Date: Thu, 5 Oct 2017 19:35:00 +0000 Subject: [PATCH 2/5] backup ramdisk on shutdown --- system/sbin/kazoo-kamailio | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index 1bfd1e3..4b1be91 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -85,6 +85,11 @@ start() { stop() { killall ${BIN_FILE} RETVAL=$? + if mount_point_exists; then + if [ -f /etc/kazoo/kamailio/kazoo.db ]; then + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + fi + fi } restart() { From f84c39a54f2587fd932166a3f540687a8d9591b1 Mon Sep 17 00:00:00 2001 From: swysor Date: Thu, 5 Oct 2017 19:38:55 +0000 Subject: [PATCH 3/5] backup ramdisk on shutdown --- system/sbin/kazoo-kamailio | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index 4b1be91..f16e59d 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -26,37 +26,37 @@ if test "$DUMP_CORE" = "yes" ; then fi prepare() { - mkdir -p /var/run/kamailio - chown -R ${USER} /var/run/kamailio - if [ -e ${PID_FILE} ]; then - rm -rf ${PID_FILE} - fi - if ram_disk_enabled; then - if ! mount_point_exists; then - if [ -f /etc/kazoo/kamailio/kazoo.db ]; then - mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old - fi - mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db - if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then - cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ - fi - fi - fi - if [ ! -f /etc/kazoo/kamailio/db/kazoo.db ]; then - KazooDB -init /etc/kazoo/kamailio/kazoodb.sql - fi - chown -R ${USER} /etc/kazoo/kamailio/db - RETVAL=$? + mkdir -p /var/run/kamailio + chown -R ${USER} /var/run/kamailio + if [ -e ${PID_FILE} ]; then + rm -rf ${PID_FILE} + fi + if ram_disk_enabled; then + if ! mount_point_exists; then + if [ -f /etc/kazoo/kamailio/kazoo.db ]; then + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + fi + mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db + if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then + cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ + fi + fi + fi + if [ ! -f /etc/kazoo/kamailio/db/kazoo.db ]; then + KazooDB -init /etc/kazoo/kamailio/kazoodb.sql + fi + chown -R ${USER} /etc/kazoo/kamailio/db + RETVAL=$? } ram_disk_enabled() { - grep -e "^\s*enable_ram_disk\s*=\s*true" /etc/kazoo/kamailio/local.cfg &> /dev/null - return $? + grep -e "^\s*enable_ram_disk\s*=\s*true" /etc/kazoo/kamailio/local.cfg &> /dev/null + return $? } mount_point_exists() { - mount | grep /etc/kazoo/kamailio/db &> /dev/null - return $? + mount | grep /etc/kazoo/kamailio/db &> /dev/null + return $? } @@ -86,9 +86,9 @@ stop() { killall ${BIN_FILE} RETVAL=$? if mount_point_exists; then - if [ -f /etc/kazoo/kamailio/kazoo.db ]; then + if [ -f /etc/kazoo/kamailio/kazoo.db ]; then mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old - fi + fi fi } From 8f59c872df14d450362001e67cae8f94f01d5ca0 Mon Sep 17 00:00:00 2001 From: swysor Date: Thu, 5 Oct 2017 19:40:47 +0000 Subject: [PATCH 4/5] fix tabs, because tabs are silly --- system/sbin/kazoo-kamailio | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index f16e59d..e3e1647 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -32,18 +32,18 @@ prepare() { rm -rf ${PID_FILE} fi if ram_disk_enabled; then - if ! mount_point_exists; then - if [ -f /etc/kazoo/kamailio/kazoo.db ]; then - mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old - fi - mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db - if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then - cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ + if ! mount_point_exists; then + if [ -f /etc/kazoo/kamailio/kazoo.db ]; then + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + fi + mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db + if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then + cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ + fi fi - fi fi if [ ! -f /etc/kazoo/kamailio/db/kazoo.db ]; then - KazooDB -init /etc/kazoo/kamailio/kazoodb.sql + KazooDB -init /etc/kazoo/kamailio/kazoodb.sql fi chown -R ${USER} /etc/kazoo/kamailio/db RETVAL=$? From 1185140baad66f9370edc83b7e812e64c59600c2 Mon Sep 17 00:00:00 2001 From: swysor Date: Thu, 5 Oct 2017 19:42:41 +0000 Subject: [PATCH 5/5] s/old/backup/g --- system/sbin/kazoo-kamailio | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index e3e1647..af4d6ef 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -34,11 +34,11 @@ prepare() { if ram_disk_enabled; then if ! mount_point_exists; then if [ -f /etc/kazoo/kamailio/kazoo.db ]; then - mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-backup fi mount -t tmpfs -o size=256m tmpfs /etc/kazoo/kamailio/db - if [ -f /etc/kazoo/kamailio/db-old/kazoo.db ]; then - cp -a /etc/kazoo/kamailio/db-old/* /etc/kazoo/kamailio/db/ + if [ -f /etc/kazoo/kamailio/db-backup/kazoo.db ]; then + cp -a /etc/kazoo/kamailio/db-backup/* /etc/kazoo/kamailio/db/ fi fi fi @@ -87,7 +87,7 @@ stop() { RETVAL=$? if mount_point_exists; then if [ -f /etc/kazoo/kamailio/kazoo.db ]; then - mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-old + mv /etc/kazoo/kamailio/db /etc/kazoo/kamailio/db-backup fi fi }