MyFavMirrors/metrics.sh
1
0
Fork 0
mirror of https://github.com/pstadler/metrics.sh.git synced 2025-11-09 05:34:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update from review.

Browse Source
This commit is contained in:
Andreas Grimm
2019-03-11 09:00:45 +01:00
parent bc23216756
commit 2cca88ed8d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/main.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
# load utils
for util in ${DIR}/lib/utils/*.sh; do
for util in ${PWD}/lib/utils/*.sh; do
. $util
done
@@ -16,10 +16,10 @@ main_defaults () {
DEFAULT_REPORTER=stdout
fi
if [ -z $CUSTOM_REPORTERS_PATH ]; then
CUSTOM_REPORTERS_PATH=${DIR}/reporters/custom
CUSTOM_REPORTERS_PATH=${PWD}/reporters/custom
fi
if [ -z $CUSTOM_METRICS_PATH ]; then
CUSTOM_METRICS_PATH=${DIR}/metrics/custom
CUSTOM_METRICS_PATH=${PWD}/metrics/custom
fi
}

8
lib/utils/loader.sh
View File

@@ -2,7 +2,7 @@
get_available_reporters () {
local result
for file in `ls ${DIR}/reporters/*.sh $CUSTOM_REPORTERS_PATH/*.sh 2> /dev/null`; do
for file in `ls ${PWD}/reporters/*.sh $CUSTOM_REPORTERS_PATH/*.sh 2> /dev/null`; do
local filename=$(basename $file)
local reporter=${filename%.*}
result=$(echo "$result $reporter")
@@ -12,7 +12,7 @@ get_available_reporters () {
get_available_metrics () {
local result
for file in `ls ${DIR}/metrics/*.sh $CUSTOM_METRICS_PATH/*.sh 2> /dev/null`; do
for file in `ls ${PWD}/metrics/*.sh $CUSTOM_METRICS_PATH/*.sh 2> /dev/null`; do
local filename=$(basename $file)
local metric=${filename%.*}
# register metric
@@ -26,7 +26,7 @@ load_reporter_with_prefix () {
local name=$2
local file
for dir in $CUSTOM_REPORTERS_PATH ${DIR}/reporters; do
for dir in $CUSTOM_REPORTERS_PATH ${PWD}/reporters; do
if [ -f $dir/$name.sh ]; then
file=$dir/$name.sh
break
@@ -53,7 +53,7 @@ load_metric_with_prefix () {
local name=$2
local file
for dir in $CUSTOM_METRICS_PATH ${DIR}/metrics; do
for dir in $CUSTOM_METRICS_PATH ${PWD}/metrics; do
if [ -f $dir/$name.sh ]; then
file=$dir/$name.sh
break