codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-02 20:07:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2067 from riking/better-backup-name

Browse source 
Add site name to beginning of backup filename
This commit is contained in:
Régis Hanol 2014-03-07 11:47:58 +01:00
commit f52ab7fc77
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -7,7 +7,7 @@ require_dependency "homepage_constraint"
# This used to be User#username_format, but that causes a preload of the User object # This used to be User#username_format, but that causes a preload of the User object
# and makes Guard not work properly. # and makes Guard not work properly.
USERNAME_ROUTE_FORMAT = /[A-Za-z0-9\_]+/ unless defined? USERNAME_ROUTE_FORMAT USERNAME_ROUTE_FORMAT = /[A-Za-z0-9\_]+/ unless defined? USERNAME_ROUTE_FORMAT
BACKUP_ROUTE_FORMAT = /\d{4}(-\d{2}){2}-\d{6}\.tar\.gz/i unless defined? BACKUP_ROUTE_FORMAT BACKUP_ROUTE_FORMAT = /[a-zA-Z0-9\-_]*\d{4}(-\d{2}){2}-\d{6}\.tar\.gz/i unless defined? BACKUP_ROUTE_FORMAT
Discourse::Application.routes.draw do Discourse::Application.routes.draw do

2
lib/export/exporter.rb
View file

@ -71,7 +71,7 @@ module Export
@dump_filename = File.join(@tmp_directory, BackupRestore::DUMP_FILE) @dump_filename = File.join(@tmp_directory, BackupRestore::DUMP_FILE)
@meta_filename = File.join(@tmp_directory, BackupRestore::METADATA_FILE) @meta_filename = File.join(@tmp_directory, BackupRestore::METADATA_FILE)
@archive_directory = File.join(Rails.root, "public", "backups", @current_db) @archive_directory = File.join(Rails.root, "public", "backups", @current_db)
@archive_basename = File.join(@archive_directory, @timestamp) @archive_basename = File.join(@archive_directory, "#{SiteSetting.title.parameterize}-#{@timestamp}")
end end
def listen_for_shutdown_signal def listen_for_shutdown_signal