github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't blow up if Redis switches to READONLY

Browse Source
This commit is contained in:
Robin Ward
2015-04-24 13:10:43 -04:00
parent 8129cce104
commit 5b3f99aa50
56 changed files with 194 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/backup_restore/backup_restore.rb
View File

@ -62,7 +62,7 @@ module BackupRestore
def self.logs
id = start_logs_message_id
MessageBus.backlog(LOGS_CHANNEL, id).map { |m| m.data }
DiscourseBus.backlog(LOGS_CHANNEL, id).map { |m| m.data }
end
def self.current_version
@ -142,7 +142,7 @@ module BackupRestore
end
def self.save_start_logs_message_id
id = MessageBus.last_id(LOGS_CHANNEL)
id = DiscourseBus.last_id(LOGS_CHANNEL)
$redis.set(start_logs_message_id_key, id)
end

2
lib/backup_restore/backuper.rb
View File

@ -336,7 +336,7 @@ module BackupRestore
def publish_log(message, timestamp)
return unless @publish_to_message_bus
data = { timestamp: timestamp, operation: "backup", message: message }
MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
DiscourseBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
end
def save_log(message, timestamp)

2
lib/backup_restore/restorer.rb
View File

@ -354,7 +354,7 @@ module BackupRestore
def publish_log(message, timestamp)
return unless @publish_to_message_bus
data = { timestamp: timestamp, operation: "restore", message: message }
MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
DiscourseBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id])
end
def save_log(message, timestamp)