s3log 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e1cf5759832d0b418f7a87e503e22ad6abc6c2
-  data.tar.gz: d7e95c7249c91bfd6b868f7b35d13fb6cf50f2fe
+  metadata.gz: 0bde1aff2eb20a032be6705f2a5c9d47ad593799
+  data.tar.gz: 17b2ca8475e553f3b606099bcb9b086e5fc2c21f
 SHA512:
-  metadata.gz: f995e5e3fab29e773f7480a52241e9f1a448c08e2ca4b06c63529235d4e1c5f8d558ba7351238554483ce945ed50699e26cc0ca82f7a4f483948b85fd04389de
-  data.tar.gz: 0817870abf853d6f3d80558514c3931b10d0a555c7df7380553ba5b8767a6b469785041278c6c016789ff14e6ffc837d73c09c86fb1564d8640ffcd8b966f431
+  metadata.gz: 8bff5484f38ae6359d3de85a5bdcd30c0f97cfba05eaec88a50a993b63d46fd1ed76a9bfb00ddb2ecac2b1a949810ce983ced8c66d439959b411de71a1d5fa65
+  data.tar.gz: 8d2ab0819d3f059dd29c318f6454df4da1fb4d3cd019cfb9835287c313f226c70470e979c2f119f0a799772b924ff1e6f805887aebf10cab09af703e26d2c46a

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 S3log Changelog
 -------------------
 
+### v0.0.4 - 2014-01-15
+
+* fix cron line for jobs when config file is specified on commandline
+* add jobname in log when same s3log is used with different configs
+
 ### v0.0.3 - 2014-01-15
 
 * refix on crontab scheduling for good this time

data/README.md

@@ -11,7 +11,7 @@ S3log script is intended to transform this logging in a unified logfile wherever
 
 It's designed to run on debian/ubuntu servers but should work on any linux server, and it also work on mac osx. It works with ruby 1.9 and 2.0 (but not 1.8).
 
-(work in progress, not ready for use yet).
+(work in progress, not ready for use yet, check the [Changelog](CHANGELOG.md)).
 
 ## Installation
 

data/lib/s3log/cron.rb

@@ -4,7 +4,7 @@ module S3log
     def initialize(configfile)
       @configfile = configfile
       @config = YAML::load_file(configfile)
-      @path = File.dirname(configfile)
+      @path = File.dirname(File.expand_path(configfile))
       @jobname = @config['jobname']
       @schedule = @config['schedule']
       @logdir = @config['logdir']
@@ -27,9 +27,9 @@ module S3log
       tmp_cron_file << "# S3log job #{@jobname}\n#{line}" unless included
       tmp_cron_file.fsync
       if system("crontab #{tmp_cron_file.path}")
-        S3log::Log.info "[update] crontab updated."
+        S3log::Log.info "#{@jobname} [update] crontab updated."
       else
-        S3log::Log.warn "[fail] Couldn't write crontab."
+        S3log::Log.warn "#{@jobname} [fail] Couldn't write crontab."
         tmp_cron_file.close!
         exit(1)
       end

data/lib/s3log/runner.rb

@@ -12,6 +12,7 @@ module S3log
       )
       @bucket = @s3.buckets[@config['bucket']]
       @prefix = @config['prefix']
+      @jobname = @config['jobname']
       @logdir = @config['logdir']
       FileUtils.mkdir(@logdir) unless Dir.exists? @logdir
       S3log::Log.set_logger(File.join(@logdir, 's3log.log'), @config['loglevel'])
@@ -30,7 +31,7 @@ module S3log
     def download
       if items.size > 0
         time = Time.now
-        S3log::Log.info "Downloading #{items.size} file."
+        S3log::Log.info "#{@jobname} Downloading #{items.size} file."
         File.open(@config['outputfile'], 'a+') do |f|
           items.each do |i|
             f.puts @bucket.objects[i].read
@@ -38,7 +39,7 @@ module S3log
             @bucket.objects[i].delete
           end
         end
-        S3log::Log.info "... done in #{Time.now - time}s."
+        S3log::Log.info "#{@jobname} ... done in #{Time.now - time}s."
       else
         S3log::Log.debug "No file to download."
       end

data/lib/s3log/version.rb

@@ -1,3 +1,3 @@
 module S3log
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3log
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mose