From 8a16abbd760884d7c662a79e9d4cc9cdab51bd94 Mon Sep 17 00:00:00 2001 From: Nathan Huizinga Date: Wed, 20 Dec 2017 10:56:05 +0100 Subject: [PATCH] Fixed: /var/log/log2ram.log handled like all other files. --- README.md | 2 +- log2ram | 12 +++--------- log2ram.logrotate | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b7a8bc8..ca00c0c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ mount If you have issue with apache2 , you can try to add `apache2.service` next to other services on the `Before` parameter into /etc/systemd/system/log2ram.service it will solve the pb -The log for log2ram will be write here : `/var/hdd.log/log2ram.log` +The log for log2ram will be write here : `/var/log/log2ram.log` ###### Now, muffins for everyone ! diff --git a/log2ram b/log2ram index a793311..dc56e2c 100755 --- a/log2ram +++ b/log2ram @@ -6,8 +6,7 @@ HDD_LOG=/var/hdd.log RAM_LOG=/var/log LOG_NAME="log2ram.log" -LOGROTATE_PATTERN="${LOG_NAME}*" -LOG2RAM_LOG="${HDD_LOG}/${LOG_NAME}" +LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}" LOG_OUTPUT="tee -a $LOG2RAM_LOG" isSafe () { @@ -19,7 +18,7 @@ syncToDisk () { isSafe if [ "$USE_RSYNC" = true ]; then - rsync -aXWv --delete --exclude $LOGROTATE_PATTERN --links $RAM_LOG/ $HDD_LOG/ 2>&1 | $LOG_OUTPUT + rsync -aXWv --delete --links $RAM_LOG/ $HDD_LOG/ 2>&1 | $LOG_OUTPUT else cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | $LOG_OUTPUT fi @@ -39,7 +38,7 @@ syncFromDisk () { fi if [ "$USE_RSYNC" = true ]; then - rsync -aXWv --delete --exclude $LOGROTATE_PATTERN --links $HDD_LOG/ $RAM_LOG/ 2>&1 | $LOG_OUTPUT + rsync -aXWv --delete --links $HDD_LOG/ $RAM_LOG/ 2>&1 | $LOG_OUTPUT else cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | $LOG_OUTPUT fi @@ -52,11 +51,6 @@ wait_for () { } case "$1" in - clean-rotate) - rm -f $HDD_LOG/$LOGROTATE_PATTERN - rm -f $RAM_LOG/$LOGROTATE_PATTERN - ;; - rotate) rm -f $LOG2RAM_LOG ;; diff --git a/log2ram.logrotate b/log2ram.logrotate index 9cb844d..3db6498 100644 --- a/log2ram.logrotate +++ b/log2ram.logrotate @@ -1,4 +1,4 @@ -/var/hdd.log/log2ram.log +/var/log/log2ram.log { rotate 7 daily