frodovdr/log2ram
1
0
Fork 0
mirror of https://github.com/azlux/log2ram.git synced 2023-10-10 13:37:24 +02:00
Code Issues Projects Releases Wiki Activity

Additionnal path

Browse Source 
feature for #96
This commit is contained in:
Azlux 2020-05-03 21:51:44 +02:00
parent 853ae88d3f
commit f6e81bc8c1
2 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
log2ram
View File

@ -2,12 +2,8 @@
. /etc/log2ram.conf
HDD_LOG=/var/hdd.log
RAM_LOG=/var/log
LOG_NAME="log2ram.log"
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
LOG_OUTPUT="tee -a $LOG2RAM_LOG"
isSafe () {
[ -d $HDD_LOG/ ] || echo "ERROR: $HDD_LOG/ doesn't exist! Can't sync."
@ -18,9 +14,9 @@ syncToDisk () {
isSafe
if [ "$USE_RSYNC" = true ]; then
rsync -aXv --inplace --no-whole-file --delete-after $RAM_LOG/ $HDD_LOG/ 2>&1 | $LOG_OUTPUT
rsync -aXv --inplace --no-whole-file --delete-after $RAM_LOG/ $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
else
cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | $LOG_OUTPUT
cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
fi
}
@ -28,19 +24,19 @@ syncFromDisk () {
isSafe
if [ ! -z "$(du -sh -t "$SIZE" $HDD_LOG/ | cut -f1)" ]; then
echo "ERROR: RAM disk too small. Can't sync."
echo "ERROR: RAM disk for "$HDD_LOG/" too small. Can't sync."
umount -l $RAM_LOG/
umount -l $HDD_LOG/
if [ "$MAIL" = true ]; then
echo "LOG2RAM : No place on RAM anymore, fallback on the disk" | mail -s 'Log2Ram Error' root;
echo "LOG2RAM : No place on RAM for "$HDD_LOG/" anymore, fallback on the disk" | mail -s 'Log2Ram Error' root;
fi
exit 1
fi
if [ "$USE_RSYNC" = true ]; then
rsync -aXv --inplace --no-whole-file --delete-after $HDD_LOG/ $RAM_LOG/ 2>&1 | $LOG_OUTPUT
rsync -aXv --inplace --no-whole-file --delete-after $HDD_LOG/ $RAM_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
else
cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | $LOG_OUTPUT
cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | tee -a $LOG2RAM_LOG
fi
}
@ -66,10 +62,19 @@ createZramLogDrive () {
case "$1" in
start)
IFS=';'
for i in $PATH_DISK; do
PATH_FIRST_PART=$( echo ${i%/*} )
PATH_LAST_PART=$( echo ${i##/*/} )
RAM_LOG=$i
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
[ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
mount --bind $RAM_LOG/ $HDD_LOG/
mount --make-private $HDD_LOG/
wait_for $HDD_LOG
if [ "$ZL2R" = true ]; then
createZramLogDrive
mount -t ext4 -o nosuid,noexec,nodev,user=log2ram /dev/zram${RAM_DEV} ${RAM_LOG}/
@ -78,9 +83,18 @@ case "$1" in
fi
wait_for $RAM_LOG
syncFromDisk
done
;;
stop)
IFS=';'
for i in $PATH_DISK; do
PATH_FIRST_PART=$( echo ${i%/*} )
PATH_LAST_PART=$( echo ${i##/*/} )
RAM_LOG=$i
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
syncToDisk
#ZRAM_LOG=$(awk '$2 == "/var/log" {print $1}' /proc/mounts)
#ZRAM_LOG=$(echo ${ZRAM_LOG} | grep -o -E '[0-9]+')
@ -88,10 +102,20 @@ case "$1" in
umount -l $HDD_LOG/
# Unsure as even with Root permision denied
#echo ${ZRAM_LOG} > /sys/class/zram-control/hot_remove
done
;;
write)
IFS=';'
for i in $PATH_DISK; do
PATH_FIRST_PART=$( echo ${i%/*} )
PATH_LAST_PART=$( echo ${i##/*/} )
RAM_LOG=$i
HDD_LOG=$PATH_FIRST_PART/hdd.$PATH_LAST_PART
LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
syncToDisk
done
;;
*)

3
log2ram.conf
View File

@ -16,6 +16,9 @@ USE_RSYNC=false
# Change it to false and you will have only a log if there is no place on RAM anymore.
MAIL=true
# Variable for folders to put in RAM. You need to specify the real folder `/path/folder` , the `/path/hdd.folder` will be automatically created. Multiple path can be separeted by `;`. Do not add the final `/` !
PATH_DISK="/var/log"
# **************** Zram backing conf *************************************************
# ZL2R Zram Log 2 Ram enables a zram drive when ZL2R=true ZL2R=false is mem only tmpfs