diff --git a/chef/cookbooks/common/files/default/backupcron.txt b/chef/cookbooks/common/files/default/backupcron.txt index 999ee32e3..ff7d6760c 100644 --- a/chef/cookbooks/common/files/default/backupcron.txt +++ b/chef/cookbooks/common/files/default/backupcron.txt @@ -1,2 +1,2 @@ -42 * * * * cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake backup:mongo 2>> /usr/local/app/diaspora/log/rake_mongo.log -42 15 * * * cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake backup:photos 2>> /usr/local/app/diaspora/log/rake_photos.log +42 * * * * cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake --trace backup:mongo 2>> /usr/local/app/diaspora/log/rake_mongo.log +42 15 * * * cd /usr/local/app/diaspora && exec /usr/local/bin/ruby /usr/local/bin/bundle exec rake --trace backup:photos 2>> /usr/local/app/diaspora/log/rake_photos.log diff --git a/lib/tasks/backup.rake b/lib/tasks/backup.rake index 548452b88..f3a64377b 100644 --- a/lib/tasks/backup.rake +++ b/lib/tasks/backup.rake @@ -4,7 +4,7 @@ namespace :backup do require 'cloudfiles' task :mongo do - Rails.logger.info("event=backup status=start type=mongo") + puts("event=backup status=start type=mongo") if AppConfig[:cloudfiles_username] && AppConfig[:cloudfiles_api_key] puts "Logging into Cloud Files" @@ -21,11 +21,11 @@ namespace :backup do file = mongo_container.create_object(tar_name) if file.write File.open("/tmp/backup/" + tar_name) - Rails.logger.info("event=backup status=success type=mongo") + puts("event=backup status=success type=mongo") `rm /tmp/backup/#{tar_name}` `rm -rf /tmp/backup/mongo/` else - Rails.logger.info("event=backup status=failure type=mongo") + puts("event=backup status=failure type=mongo") end else puts "Cloudfiles username and api key needed" @@ -33,7 +33,7 @@ namespace :backup do end task :photos do - Rails.logger.info("event=backup status=start type=photos") + puts("event=backup status=start type=photos") if AppConfig[:cloudfiles_username] && AppConfig[:cloudfiles_api_key] puts "Logging into Cloud Files" @@ -47,10 +47,10 @@ namespace :backup do file = photo_container.create_object(tar_name) if file.write File.open("/tmp/backup/" + tar_name) - Rails.logger.info("event=backup status=success type=photos") + puts("event=backup status=success type=photos") `rm /tmp/backup/#{tar_name}` else - Rails.logger.info("event=backup status=failure type=photos") + puts("event=backup status=failure type=photos") end else puts "Cloudfiles username and api key needed"