瀏覽代碼

Add date and time to logging

Bob Mottram 10 年之前
父節點
當前提交
ccebbfcc66
共有 1 個檔案被更改,包括 5 行新增4 行删除
  1. 5
    4
      install-freedombone.sh

+ 5
- 4
install-freedombone.sh 查看文件

@@ -2108,16 +2108,17 @@ function backup_to_friends_servers {
2108 2108
   echo "awk -F ' ' '{print $3}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2109 2109
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2110 2110
 
2111
-  echo '  logger -s "Starting backup to $RSYNC_SERVER" 2> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2111
+  echo '  NOW=$(date +"%Y-%m-%d %H:%M:%S")' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2112
+  echo '  logger -s "$NOW Starting backup to $RSYNC_SERVER" >> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2112 2113
   echo -n '  rsync -avz -e "ssh -p $RSYNC_SSH_PORT" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2113 2114
   echo '$SERVER_DIRECTORY/backup $RSYNC_SERVER' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2114 2115
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2115
-  echo '    logger -s "Backup to $RSYNC_SERVER failed" 2> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2116
+  echo '    logger -s "$NOW Backup to $RSYNC_SERVER failed" >> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2116 2117
   echo '    # Send a warning email' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2117
-  echo -n '  echo "Backup to $RSYNC_SERVER failed" | mail -s "Freedombone backup to friends" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2118
+  echo -n '    echo "Backup to $RSYNC_SERVER failed" | mail -s "Freedombone backup to friends" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2118 2119
   echo "$EMAIL_ADDRESS" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2119 2120
   echo '  else' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2120
-  echo '    logger -s "Backed up to $RSYNC_SERVER" 2> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2121
+  echo '    logger -s "$NOW Backed up to $RSYNC_SERVER" >> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2121 2122
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
2122 2123
 
2123 2124
   # End of the loop