projects
/
rrq
/
nilfs2sss.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ee98f24
)
corrected time logic older is less
author
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Thu, 10 Dec 2020 01:36:51 +0000
(12:36 +1100)
committer
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Thu, 10 Dec 2020 01:36:51 +0000
(12:36 +1100)
sss.sh
patch
|
blob
|
history
diff --git
a/sss.sh
b/sss.sh
index cda1b1b1124a67702c5cfa8a4aa730ff13f2f235..46facf989e0e4092283c3e90b6b4b236e015bfcd 100755
(executable)
--- a/
sss.sh
+++ b/
sss.sh
@@
-34,9
+34,9
@@
YEARLY="$(date -d '-1 year' '+%Y-%m-%d %H:%M:%S')"
MARK=( )
function marksnap() {
if [[ "${MARK[0]}" == "$1" ]] && [[ "${MARK[1]}" = "$2" ]] ; then
MARK=( )
function marksnap() {
if [[ "${MARK[0]}" == "$1" ]] && [[ "${MARK[1]}" = "$2" ]] ; then
- chcp cp $DEV ${MARK
YEAR
[2]}
+ chcp cp $DEV ${MARK[2]}
fi
fi
- MARK=( "$1" "$2"
$3
)
+ MARK=( "$1" "$2"
"$3"
)
}
{ flock 9
}
{ flock 9
@@
-45,16
+45,16
@@
function marksnap() {
lscp -s $DEV | while read CNO DATE TIME REST ; do
TS="$DATE $TIME"
[ "$CNO" = "CNO" ] && continue
lscp -s $DEV | while read CNO DATE TIME REST ; do
TS="$DATE $TIME"
[ "$CNO" = "CNO" ] && continue
- if [[ "$TS"
>
"$YEARLY" ]] ; then
+ if [[ "$TS"
<
"$YEARLY" ]] ; then
marksnap YEAR "${DATE:0:4}" $CNO
marksnap YEAR "${DATE:0:4}" $CNO
- elif [[ "$TS"
>
"$MONTHLY" ]] ; then
+ elif [[ "$TS"
<
"$MONTHLY" ]] ; then
marksnap MONTH "${DATE:5:2}" $CNO
marksnap MONTH "${DATE:5:2}" $CNO
- elif [[ "$TS"
>
"$WEEKLY" ]] ; then
+ elif [[ "$TS"
<
"$WEEKLY" ]] ; then
# For older than most recent week, keep last snapshot each week
marksnap WEEK "$(( 7${DATE:8:2} / 7 - 100 ))" $CNO
# For older than most recent week, keep last snapshot each week
marksnap WEEK "$(( 7${DATE:8:2} / 7 - 100 ))" $CNO
- elif [[ "$TS"
>
"$DAILY" ]] ; then
+ elif [[ "$TS"
<
"$DAILY" ]] ; then
marksnap DAY "${DATE:8:2}" $CNO
marksnap DAY "${DATE:8:2}" $CNO
- elif [[ "$TS"
>
"$HOURLY" ]] ; then
+ elif [[ "$TS"
<
"$HOURLY" ]] ; then
marksnap HOUR "${DATE:8:2}-${TIME:0:2}" $CNO
else
echo "$CNO $DATE $TIME within last hour"
marksnap HOUR "${DATE:8:2}-${TIME:0:2}" $CNO
else
echo "$CNO $DATE $TIME within last hour"