diff --git a/README.md b/README.md index d814a46..5029a9c 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ bes-service is a small bash bes library to easily create systemd service. ### Usage -add bes-service as dependency in bes.ini file of your project. +add bes-service as dependency in your bes.ini file. ``` [require] -bes.service = 1.0 +bes.service = 1.1 ``` create your service following 'src/main.sh.tpl' template. @@ -25,9 +25,9 @@ edit for example 'src/main.sh' in your bes project ('myservice' in this example) # # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BES_SERVICE_NAME="myservice" -BES_SERVICE_LOGGER="myservice.type1" +BES_SERVICE_CHANNEL="mychannel" BES_SERVICE_DELAY=10 - BES_SERVICE_BOOT=1 + BES_SERVICE_BOOT=0 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # optional - service is started, do before running @@ -87,5 +87,3 @@ inspect service log : ``` tail -f /var/log/myservice.log ``` - - diff --git a/bes.ini b/bes.ini index 56014e2..d659a81 100644 --- a/bes.ini +++ b/bes.ini @@ -1,7 +1,7 @@ [project] vendor = bes name = service -version = 1.0 +version = 1.1 license = "GNU GPL v3" author = a-Sansara type = library diff --git a/src/main.sh.tpl b/src/main.sh.tpl index f2280cd..3ac2d14 100644 --- a/src/main.sh.tpl +++ b/src/main.sh.tpl @@ -6,10 +6,10 @@ # @date 2017-07-07 02:21:51 CET # # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - BES_SERVICE_NAME="myservice" -BES_SERVICE_LOGGER="myservice.type1" - BES_SERVICE_DELAY=10 - BES_SERVICE_BOOT=1 + BES_SERVICE_NAME="myservice" +BES_SERVICE_CHANNEL="myservice.type1" + BES_SERVICE_DELAY=10 + BES_SERVICE_BOOT=1 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # optional - service is started, do before running diff --git a/src/service.sh b/src/service.sh index 9cdf64e..68878ea 100644 --- a/src/service.sh +++ b/src/service.sh @@ -10,9 +10,11 @@ function bes.service.boot () { BES_SERVICE_NAME="yourservice" - BES_SERVICE_LOGGER="channel1" +BES_SERVICE_CHANNEL="channel1" BES_SERVICE_DELAY=0 BES_SERVICE_BOOT=0 + BES_SERVICE_LOG="/var/log/$BES_SERVICE_NAME.log" +BES_SERVICE_RUN_DIR="/run/$BES_SERVICE_NAME" } # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function service.time() @@ -28,7 +30,7 @@ function service.log() if [ "$display" = "1" ]; then echo "[$dt] $msg"; fi - echo "[$dt] $BES_SERVICE_LOGGER $msg" >> "$BES_SERVICE_LOG" + echo "[$dt] $BES_SERVICE_CHANNEL $msg" >> "$BES_SERVICE_LOG" } # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function service.init() @@ -95,8 +97,8 @@ function service.run() service.on.run elif [ "$BES_SERVICE_DELAY" -gt 0 ]; then while true; do - sleep $BES_SERVICE_DELAY service.on.run + sleep $BES_SERVICE_DELAY done fi fi @@ -138,8 +140,6 @@ WantedBy=multi-user.target # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function service.launch() { - export BES_SERVICE_LOG="/var/log/$BES_SERVICE_NAME.log" - export BES_SERVICE_RUN_DIR="/run/$BES_SERVICE_NAME" case "$1" in install) service.install "$2" @@ -159,8 +159,6 @@ function service.launch() esac } # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -declare -f bes.reg > /dev/null -if [ $? -eq 0 ]; then +if bes.exists bes.reg; then bes.reg bes.service fi -