luban 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c563073b69ea371e1a9c159be4566c5d7161b4
-  data.tar.gz: 6c236d456d1294ea1442dc122fe72e6944acc516
+  metadata.gz: f7f56432034ca3f37b4bdb2e9984223083f21843
+  data.tar.gz: 91057327dff28e84d3e13353dc917022ce53659f
 SHA512:
-  metadata.gz: 1639d72e4af369143739948fa6be33ed4042aa59615c25beea4ce17c5456379e44a8b1f5872e2902df6547e834130c01afe8690fd4c36e8dc9f203950ea465c9
-  data.tar.gz: 00bfdfa1dfe994b53c9f8845b14535d7c71a0eff24ad2def96fe2a4739e81664501021e435c4d1a6093b920a7bed9599677af9cfd2547e1e3882a626ff331105
+  metadata.gz: 5e5b7eaec61be97da7fe826ab300c800f091b7a1168a94b077919325c3132b8d491b2559d8e80dc6cc6db88898f1d9a11ea69b8987d9083c8ce7c12bc423a58e
+  data.tar.gz: 3baa07d7e53473c598c7b0072c7eaa78444b1191e52745702bf4356f3d84baa56630c6484bb0f3d554be0439269f798bb31c1d2d01569cfc1696b128042ed0e1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.9.8 (Oct 19, 2016)
+
+New features:
+  * Added new parameters, #logrotate_max_age, #logrotate_interval and #logrotate_count for log rotation control
+    * Refactored these out from logrotate config to make change easier & cleaner
+    * Respected the environment variable, #LUBAN_LOGROTATE_INTERVAL, to receive the default value
+    * Updated crontab logrotate configuration to utilize the new parameters
+  * Bump up gem dependency of luban-cli to 0.4.8
+
 ## Version 0.9.7 (Oct 19, 2016)
 
 Bug fixes:

data/lib/luban/deployment/parameters.rb

@@ -117,9 +117,14 @@ module Luban
       module Application
         extend Base
 
+        DefaultLogrotateMaxAge = 7 # days
+        DefaultLogrotateInterval = 10 # mins
+
         parameter :application
         parameter :scm_role
         parameter :archive_role
+        parameter :logrotate_max_age
+        parameter :logrotate_interval
 
         def env_name
           @env_name ||= "#{stage}.#{project}/#{application}"
@@ -133,11 +138,18 @@ module Luban
           monitor_defined? and !monitor_itself?
         end
 
+        def logrotate_count
+          logrotate_max_age * 24 * (60 / logrotate_interval)
+        end
+
         protected
 
         def set_default_application_parameters
           set_default :scm_role, :scm
           set_default :archive_role, :archive
+          set_default :logrotate_max_age, DefaultLogrotateMaxAge
+          set_default :logrotate_interval, 
+                      (ENV['LUBAN_LOGROTATE_INTERVAL'] || DefaultLogrotateInterval).to_i
           setup_default_application_config_finder
         end
 

data/lib/luban/deployment/templates/application/config/templates/profile/app/crontab.logrotate.erb.erb

@@ -3,8 +3,8 @@
 <%%= log_path.join('cron.*.log') %> {
   hourly
   maxsize 5M
-  maxage 14
-  rotate <%%= 14 * 24 * (60 / 10) %>
+  maxage <%= logrotate_max_age %>
+  rotate <%= logrotate_count %>
   missingok
   compress
   compresscmd <%%= `which gzip`.chomp %>

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

data/luban.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
-  spec.add_runtime_dependency 'luban-cli', ">=0.4.6"
+  spec.add_runtime_dependency 'luban-cli', ">=0.4.8"
   spec.add_runtime_dependency 'sshkit'
   
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Rubyist Lei
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement