Merge pull request #20 from THE-POWERNEWS/develop

1.4.2

Author: pooza

app/lib/writers_base/installer.rb

@@ -22,6 +22,7 @@ def uninstall
     end
 
     def install
+      uninstall
       periods.each do |period|
         entries(period).each do |tool|
           path = dest(period, tool)

app/lib/writers_base/tool/access_log_compress_tool.rb

@@ -15,7 +15,7 @@ def exec(args = {})
     end
 
     def description
-      return "#{dir}の#{days}日経過したログファイルを、gzip圧縮します。"
+      return "#{dir}の#{days}日経過したログファイルを、zstd圧縮します。"
     end
 
     private

app/lib/writers_base/tool/mysql_dump_tool.rb

@@ -30,7 +30,7 @@ def dump(path, params = {})
         '-u', params[:user],
         '--port', params[:port],
         params[:db],
-        :|, 'gzip',
+        :|, 'zstd', "-#{config['/zstd/level']}",
         :>, path
       ])
       command.env = {'MYSQL_PWD' => params[:password]}
@@ -56,13 +56,13 @@ def delete_old_files(dir)
     def finder(dir)
       finder = Ginseng::FileFinder.new
       finder.dir = dir
-      finder.patterns = ['*.sql.gz']
+      finder.patterns = ['*.sql.zst', '*.sql.gz']
       finder.mtime = days
       return finder
     end
 
     def dump_path(db, dir)
-      return File.join(dir, "#{db}_#{Time.now.strftime('%Y-%m-%d')}.sql.gz")
+      return File.join(dir, "#{db}_#{Time.now.strftime('%Y-%m-%d')}.sql.zst")
     end
 
     def dest_dir

app/lib/writers_base/tool/postgresql_dump_tool.rb

@@ -30,7 +30,7 @@ def dump(path, params = {})
         '-U', params[:user],
         '-p', params[:port],
         '-d', params[:db],
-        :|, 'gzip',
+        :|, 'zstd', "-#{config['/zstd/level']}",
         :>, path
       ])
       command.env = {'PGPASSWORD' => params[:password]}
@@ -56,13 +56,13 @@ def delete_old_files(dir)
     def finder(dir)
       finder = Ginseng::FileFinder.new
       finder.dir = dir
-      finder.patterns = ['*.sql.gz']
+      finder.patterns = ['*.sql.zst', '*.sql.gz']
       finder.mtime = days
       return finder
     end
 
     def dump_path(db, dir)
-      return File.join(dir, "#{db}_#{Time.now.strftime('%Y-%m-%d')}.sql.gz")
+      return File.join(dir, "#{db}_#{Time.now.strftime('%Y-%m-%d')}.sql.zst")
     end
 
     def dest_dir

config/application.yaml

@@ -19,9 +19,8 @@ package:
     - tkoishi@b-shock.co.jp
   license: MIT
   url: https://github.com/THE-POWERNEWS/writersbase-tools
-  version: 1.4.1
+  version: 1.4.2
 ruby:
-  jit: false
   bin: /usr/bin/ruby3.3
 hourly: []
 daily: []
@@ -77,7 +76,6 @@ rsync_backup:
   sources:
     - /etc
     - /usr/local/etc
-    - /home/mastodon/repos/mastodon
   excludes:
     - .git
     - .zfs