summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-11-17 14:41:41 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-11-17 14:43:03 +0100
commit9a3de961f8db26a2c1abad4bb4c1053a65bbb79a (patch)
tree21c42fc6ceff4672a3557a2c20b607db456d752c
parent6c3a4407649487e52b7919c86f9f01f322a4e231 (diff)
parenta97e9e9854579a4f0f4455703ea9684c65aa9f3d (diff)
transfer hotfixes to develop branch
-rw-r--r--app/models/backup_job.rb1
-rw-r--r--lib/tasks/backup.rake6
2 files changed, 3 insertions, 4 deletions
diff --git a/app/models/backup_job.rb b/app/models/backup_job.rb
index e2f2e6c..b06d0d1 100644
--- a/app/models/backup_job.rb
+++ b/app/models/backup_job.rb
@@ -10,7 +10,6 @@ class BackupJob < ActiveRecord::Base
self.started_at.to_s
end
- private
def set_state_to_queued
self.state ||= 'queued'
self.started_at = Time.now
diff --git a/lib/tasks/backup.rake b/lib/tasks/backup.rake
index 0dbadad..c26bc62 100644
--- a/lib/tasks/backup.rake
+++ b/lib/tasks/backup.rake
@@ -7,13 +7,13 @@ namespace :backup do
desc "Do a backup."
task :queue_a_new_backup => :environment do
backup_job = BackupJob.create
- echo "BackupJob ID: #{backup_job.id}"
+ puts "BackupJob ID: #{backup_job.id}"
end
desc "Do a backup. Now!"
task :force_now => :environment do
backup_job = BackupJob.create(:state => 'force now')
- echo "BackupJob ID: #{backup_job.id}"
+ puts "BackupJob ID: #{backup_job.id}"
end
desc "Restore the system"
@@ -83,4 +83,4 @@ namespace :backup do
end
end
-end \ No newline at end of file
+end