s3archive 1.2.0 → 1.3.0

data/lib/s3archive/postrotate.rb

@@ -0,0 +1,70 @@
+# The main entry point db:backup_to_s3 is run by /etc/logrotate.d/rails3app
+# daily. changed
+
+require 'thor'
+require 'socket'  # For hostname
+require 'tempfile'
+require_relative 'logging'
+require_relative 'config'
+require_relative 's3_file_synchronizer'
+
+module S3Archive
+  class Postrotate
+    include Logging
+
+    def self.run(logfile_path)
+      new(logfile_path).run
+    end
+
+    attr_reader :logfile_path
+    def initialize(logfile_path)
+      @logfile_path = logfile_path
+    end
+
+    def run
+      raise "Could not find #{prev_logfile}" unless File.exists?(prev_logfile)
+      bucket = S3Archive.config.bucket
+      logger.info("* Uploading #{prev_logfile} to s3://#{bucket}/#{key}")
+      S3FileSynchronizer.run(prev_logfile, bucket, key)
+    end
+
+    private
+
+    def key
+      year, month, day = prev_date.strftime("%Y-%m-%d").split('-') # Quick & dirty way to obtain leading zeroes in months and days
+      [hostname, year, month, day, File.basename(prev_logfile)].join('/')
+    end
+
+    def hostname
+      Socket.gethostname
+    end
+
+    def prev_logfile
+      "#{logfile_basename}-#{prev_date_str}.gz"
+    end
+
+    def prev_date_str
+      prev_date.strftime("%Y%m%d")
+    end
+
+    def prev_date
+      logfile_date.prev_day
+    end
+
+    def logfile_date
+      parse_logfile_path unless @logfile_date
+      @logfile_date
+    end
+
+    def logfile_basename
+      parse_logfile_path unless @logfile_basename
+      @logfile_basename
+    end
+
+    def parse_logfile_path
+      logfile_path =~ /\A(.*)-(\d{8})\z/ || raise("Could not parse logfile path")
+      @logfile_basename = $1
+      @logfile_date = Date.strptime($2, "%Y%m%d")
+    end
+  end
+end

data/lib/tasks/s3archive.thor

@@ -1,11 +1,12 @@
 require 'thor'
 $:.unshift File.join(File.dirname(__FILE__), '..')
+require 's3archive/postrotate'
 require 's3archive/compress_and_upload'
 require 's3archive/logging'
 
 module S3Archive
   class Cli < Thor
-    include Logging
+    include ::S3Archive::Logging
     namespace :s3archive
 
     class_option :config,
@@ -15,31 +16,57 @@ module S3Archive
       :aliases => "-c",
       :default => "/etc/s3archive.yml"
 
-    desc "upload PATH [PATH...]", "Sleeps, compresses and uploads to s3://<bucket>/<year>/<month>/<day>/<filename>.gz"
-    method_option :sleep,
-                  :aliases => "-s",
-                  :default => 5,
-                  :banner => "SECONDS",
-                  :desc => "The number of seconds to sleep before uploading"
+    desc "postrotate LOGFILE [LOGFILE...]", "A postrotate hook for logrotate."
+    long_desc <<-EOF
+Uploads the logfile that was rotated yesterday! I.e., after
+logrotate has run, you will typically three files: application.log-20100805.gz
+(this is the file that is uploaded), application.log-20100806 and
+application.log.
 
-    def upload (*paths)
-      unless File.exists?(options[:config])
-        logger.error("Could not find config file #{options[:config]}")
-        exit(1)
+Note: For this to work, you *must* have the following stanzas in
+the logrotate configuration: compress, delayedcompress, dateext & ifempty.
+EOF
+
+    def postrotate (*paths)
+      set_config
+      help(:postrotate) && exit if paths.empty?
+
+      paths.each do |path|
+        begin
+          ::S3Archive::Postrotate.run(path)
+        rescue Exception => e
+          logger.error(e)
+        end
       end
+    end
 
-      S3Archive.config_path = options[:config]
+    desc "upload FILE [FILE...]", "Uploads the file(s) (compressed) to s3://bucket/<hostname>/<year>/<month>/<day>/<filename>.gz"
+    def upload (*paths)
+      set_config
       help(:upload) && exit if paths.empty?
 
-      logger.info("Sleeping for #{options[:sleep]} seconds") && sleep(options[:sleep])
       paths.each do |path|
-        CompressAndUpload.run(path)
+        begin
+          ::S3Archive::CompressAndUpload.run(path)
+        rescue Exception => e
+          logger.error(e)
+        end
       end
     end
 
     desc "genconfig", "Prints a sample config file to stdout"
     def genconfig
-      puts S3Archive::Config.sample_yaml
+      puts ::S3Archive::Config.sample_yaml
+    end
+
+    no_tasks do
+      def set_config
+        unless File.exists?(options[:config])
+          logger.error("Could not find config file #{options[:config]}")
+          exit(1)
+        end
+        ::S3Archive.config_path = options[:config]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3archive
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -71,6 +71,7 @@ files:
 - lib/s3archive/compress_and_upload.rb
 - lib/s3archive/config.rb
 - lib/s3archive/logging.rb
+- lib/s3archive/postrotate.rb
 - lib/s3archive/s3_file_synchronizer.rb
 - lib/tasks/s3archive.thor
 homepage: http://github.com/spab/s3archive