IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: backup logs on Firefox

Browse Source 
FIX: debounce backup logs in order to prevent Firefox crash
FIX: 'Invalid date' in backup logs in Firefox
This commit is contained in:
Régis Hanol
2015-02-09 16:53:28 +01:00
parent 6ae40dc1f8
commit c9a007d5fb
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/backup_restore/backuper.rb
View File

@@ -327,19 +327,20 @@ module BackupRestore
end
def log(message)
timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
puts(message) rescue nil
publish_log(message) rescue nil
save_log(message)
publish_log(message, timestamp) rescue nil
save_log(message, timestamp)
end
def publish_log(message)
def publish_log(message, timestamp)
return unless @publish_to_message_bus
data = { timestamp: Time.now, operation: "backup", message: message }
data = { timestamp: timestamp, operation: "backup", message: message }
MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
end
def save_log(message)
@logs << "[#{Time.now}] #{message}"
def save_log(message, timestamp)
@logs << "[#{timestamp}] #{message}"
end
end

13
lib/backup_restore/restorer.rb
View File

@@ -339,19 +339,20 @@ module BackupRestore
end
def log(message)
timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
puts(message) rescue nil
publish_log(message) rescue nil
save_log(message)
publish_log(message, timestamp) rescue nil
save_log(message, timestamp)
end
def publish_log(message)
def publish_log(message, timestamp)
return unless @publish_to_message_bus
data = { timestamp: Time.now, operation: "restore", message: message }
data = { timestamp: timestamp, operation: "restore", message: message }
MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
end
def save_log(message)
@logs << "[#{Time.now}] #{message}"
def save_log(message, timestamp)
@logs << "[#{timestamp}] #{message}"
end
end