mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Revert "Refactored and added support for $config['log_dir']" (#4911)
This commit is contained in:
Neil Lathwood
GitHub
170
daily.sh
170
daily.sh
@@ -1,5 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
################################################################################
|
||||
# Copyright (C) 2015 Daniel Preussker, QuxLabs UG <preussker@quxlabs.com>
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -13,143 +12,55 @@
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
#######################################
|
||||
# CONSTANTS
|
||||
#######################################
|
||||
DIR_LIBRENMS=$(dirname "$0");
|
||||
LOG_DIR=$(php -r "include '${DIR_LIBRENMS}/config.php'; isset(\$config['log_dir']) ? print \$config['log_dir'] : print \$config['install_dir'] . '/logs';");
|
||||
cd "$(dirname "$0")"
|
||||
arg="$1"
|
||||
|
||||
|
||||
#######################################
|
||||
# Fancy-Print and run commands
|
||||
# Globals:
|
||||
# LOG_DIR
|
||||
# Arguments:
|
||||
# Text
|
||||
# Command
|
||||
# Returns:
|
||||
# Exit-Code of Command
|
||||
#######################################
|
||||
# @arg Text
|
||||
# @arg Command
|
||||
# @return Exit-Code of Command
|
||||
status_run() {
|
||||
# Explicitly define our arguments
|
||||
local arg_text=$1;
|
||||
local arg_command=$2;
|
||||
local log_file;
|
||||
local exit_code;
|
||||
local tmp;
|
||||
local log_file=${LOG_DIR}/daily.log;
|
||||
|
||||
# set log_file, using librenms $config['log_dir'], if set
|
||||
# otherwise we default to ./logs/daily.log
|
||||
|
||||
printf "%-50s" "${arg_text}";
|
||||
echo "${arg_text}" >> ${log_file}
|
||||
tmp=$(bash -c "${arg_command}" 2>&1);
|
||||
exit_code=$?
|
||||
echo "${tmp}" >> ${log_file}
|
||||
echo "Returned: ${exit_code}" >> ${log_file}
|
||||
|
||||
# print OK if the command ran succesfully
|
||||
# or FAIL otherwise (non-zero exit code)
|
||||
if [[ ${exit_code} -eq 0 ]]; then
|
||||
printf " \033[0;32mOK\033[0m\n";
|
||||
else
|
||||
printf " \033[0;31mFAIL\033[0m\n";
|
||||
fi
|
||||
return ${exit_code}
|
||||
printf "%-50s" "$1"
|
||||
echo "$1" >> logs/daily.log
|
||||
tmp=$(bash -c "$2" 2>&1)
|
||||
ex=$?
|
||||
echo "$tmp" >> logs/daily.log
|
||||
echo "Returned: $ex" >> logs/daily.log
|
||||
[ $ex -eq 0 ] && echo -e ' \033[0;32mOK\033[0m' || echo -e ' \033[0;31mFAIL\033[0m'
|
||||
return $ex
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Entry into program
|
||||
# Globals:
|
||||
# DIR_LIBRENMS
|
||||
# Arguments:
|
||||
#
|
||||
# Returns:
|
||||
# Exit-Code of Command
|
||||
#######################################
|
||||
main () {
|
||||
arg="$1";
|
||||
cd ${DIR_LIBRENMS};
|
||||
|
||||
if [ -z "$arg" ]; then
|
||||
up=$(php daily.php -f update >&2; echo $?)
|
||||
if [ "$up" -eq 0 ]; then
|
||||
$0 no-code-update
|
||||
exit
|
||||
elif [ "$up" -eq 1 ]; then
|
||||
# Update to Master-Branch
|
||||
old_ver=$(git show --pretty="%H" -s HEAD)
|
||||
status_run 'Updating to latest codebase' 'git pull --quiet' ''
|
||||
new_ver=$(git show --pretty="%H" -s HEAD)
|
||||
if [ "$old_ver" != "$new_ver" ]; then
|
||||
status_run "Updated from $old_ver to $new_ver" ''
|
||||
fi
|
||||
elif [ "$up" -eq 3 ]; then
|
||||
# Update to last Tag
|
||||
old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
||||
status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))'
|
||||
new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
||||
if [ "$old_ver" -ne "$new_ver" ]; then
|
||||
status_run "Updated from $old_ver to $new_ver" ''
|
||||
fi
|
||||
if [ -z "$arg" ]; then
|
||||
up=$(php daily.php -f update >&2; echo $?)
|
||||
if [ "$up" -eq 0 ]; then
|
||||
$0 no-code-update
|
||||
exit
|
||||
elif [ "$up" -eq 1 ]; then
|
||||
# Update to Master-Branch
|
||||
old_ver=$(git show --pretty="%H" -s HEAD)
|
||||
status_run 'Updating to latest codebase' 'git pull --quiet'
|
||||
new_ver=$(git show --pretty="%H" -s HEAD)
|
||||
if [ "$old_ver" != "$new_ver" ]; then
|
||||
status_run "Updated from $old_ver to $new_ver" ''
|
||||
fi
|
||||
|
||||
cnf=$(echo $(grep '\[.distributed_poller.\]' config.php | egrep -v -e '^//' -e '^#' | cut -d = -f 2 | sed 's/;//g'))
|
||||
if ((${BASH_VERSINFO[0]} < 4)); then
|
||||
cnf=`echo $cnf|tr [:upper:] [:lower:]`
|
||||
else
|
||||
cnf=${cnf,,}
|
||||
elif [ "$up" -eq 3 ]; then
|
||||
# Update to last Tag
|
||||
old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
||||
status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))'
|
||||
new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
||||
if [ "$old_ver" -ne "$new_ver" ]; then
|
||||
status_run "Updated from $old_ver to $new_ver" ''
|
||||
fi
|
||||
|
||||
if [ -z "$cnf" ] || [ "$cnf" == "0" ] || [ "$cnf" == "false" ]; then
|
||||
# Call ourself again in case above pull changed or added something to daily.sh
|
||||
$0 post-pull
|
||||
fi
|
||||
else
|
||||
case $arg in
|
||||
no-code-update)
|
||||
# Updates of the code are disabled, just check for schema updates
|
||||
# and clean up the db.
|
||||
status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
|
||||
status_run 'Cleaning up DB' "$0 cleanup"
|
||||
;;
|
||||
post-pull)
|
||||
# List all tasks to do after pull in the order of execution
|
||||
status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
|
||||
status_run 'Updating submodules' "$0 submodules"
|
||||
status_run 'Cleaning up DB' "$0 cleanup"
|
||||
status_run 'Fetching notifications' "$0 notifications"
|
||||
;;
|
||||
cleanup)
|
||||
# Cleanups
|
||||
php daily.php -f syslog
|
||||
php daily.php -f eventlog
|
||||
php daily.php -f authlog
|
||||
php daily.php -f perf_times
|
||||
php daily.php -f callback
|
||||
php daily.php -f device_perf
|
||||
php daily.php -f purgeusers
|
||||
php daily.php -f bill_data
|
||||
php daily.php -f alert_log
|
||||
php daily.php -f rrd_purge
|
||||
;;
|
||||
submodules)
|
||||
# Init+Update our submodules
|
||||
git submodule --quiet init
|
||||
git submodule --quiet update
|
||||
;;
|
||||
notifications)
|
||||
# Get notifications
|
||||
php daily.php -f notifications
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
cnf=$(echo $(grep '\[.distributed_poller.\]' config.php | egrep -v -e '^//' -e '^#' | cut -d = -f 2 | sed 's/;//g'))
|
||||
if ((${BASH_VERSINFO[0]} < 4)); then
|
||||
cnf=`echo $cnf|tr [:upper:] [:lower:]`
|
||||
else
|
||||
cnf=${cnf,,}
|
||||
fi
|
||||
|
||||
if [ -z "$cnf" ] || [ "$cnf" == "0" ] || [ "$cnf" == "false" ]; then
|
||||
# Call ourself again in case above pull changed or added something to daily.sh
|
||||
$0 post-pull
|
||||
@@ -194,6 +105,3 @@ else
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
=======
|
||||
main "$@"
|
||||
>>>>>>> Refactored and added support for $config['log_dir']
|
||||
|
||||
Reference in New Issue
Block a user