Skip to content
Snippets Groups Projects
Commit 5b50fa9c authored by Bob Mottram's avatar Bob Mottram
Browse files

More non-blocking notifications

parent d2f5381e
No related branches found
No related tags found
No related merge requests found
......@@ -1488,10 +1488,10 @@ function backup_and_restore {
echo "if /usr/bin/timeout $BACKUP_TIMEOUT_SEC /usr/local/bin/${PROJECT_NAME}-restore-local simple \"\$backup_password\" >> $webadmin_install_dir/restore.txt; then";
echo " echo \"Completed \$(date)\" >> $webadmin_install_dir/restore.txt";
echo " cp $webadmin_install_dir/restore_complete.html $webadmin_install_dir/restore_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$restore_success_message\" -s \"[${PROJECT_NAME}] $restore_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$restore_success_message\" -s \"[${PROJECT_NAME}] $restore_title\" &";
echo 'else';
echo " cp $webadmin_install_dir/restore_failed.html $webadmin_install_dir/restore_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$restore_failed_message\" -s \"[${PROJECT_NAME}] $restore_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$restore_failed_message\" -s \"[${PROJECT_NAME}] $restore_title\" &";
echo 'fi';
echo '';
echo "chown www-data:www-data $webadmin_install_dir/restore.txt";
......@@ -1547,10 +1547,10 @@ function backup_and_restore {
echo "if /usr/bin/timeout $BACKUP_TIMEOUT_SEC /usr/local/bin/${PROJECT_NAME}-backup-local simple \"\$backup_password\" >> $webadmin_install_dir/backup.txt; then";
echo " echo \"Completed \$(date)\" >> $webadmin_install_dir/backup.txt";
echo " cp $webadmin_install_dir/backup_complete.html $webadmin_install_dir/backup_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$backup_success_message\" -s \"[${PROJECT_NAME}] $backup_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$backup_success_message\" -s \"[${PROJECT_NAME}] $backup_title\" &";
echo 'else';
echo " cp $webadmin_install_dir/backup_failed.html $webadmin_install_dir/backup_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$backup_failed_message\" -s \"[${PROJECT_NAME}] $backup_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$backup_failed_message\" -s \"[${PROJECT_NAME}] $backup_title\" &";
echo 'fi';
echo '';
echo "chown www-data:www-data $webadmin_install_dir/backup.txt";
......@@ -1575,10 +1575,10 @@ function backup_and_restore {
check_for_existing_processes $format_script
{ echo "if /usr/bin/timeout $FORMAT_TIMEOUT_SEC /usr/local/bin/${PROJECT_NAME}-format simple > $webadmin_install_dir/format.txt; then";
echo " cp $webadmin_install_dir/format_complete.html $webadmin_install_dir/format_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$format_success_message\" -s \"[${PROJECT_NAME}] $format_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$format_success_message\" -s \"[${PROJECT_NAME}] $format_title\" &";
echo 'else';
echo " cp $webadmin_install_dir/format_failed.html $webadmin_install_dir/format_progress.html";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$format_failed_message\" -s \"[${PROJECT_NAME}] $format_title\"";
echo " /usr/local/bin/${PROJECT_NAME}-notification -m \"$format_failed_message\" -s \"[${PROJECT_NAME}] $format_title\" &";
echo 'fi';
echo "chown www-data:www-data $webadmin_install_dir/format_progress.html";
echo '';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment