capitomcat 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48868d432a96f6956fc798aecdf5becabcb713a9
-  data.tar.gz: 0d29561ce9b5d05dd6306041b1fc679d73fd64f3
+  metadata.gz: f0220d095d62be811014fc54b4e5bf3f45fac497
+  data.tar.gz: cd764ebcb60a77d2a917f54beea77ab7a15afa85
 SHA512:
-  metadata.gz: 73550bdad1d01ffb5ab5dfcc609c2c48501d0dfab7c4262fdc6d7d9cd0e6d389d08e66d62111b526cb2327ce6aa6c944056e845ad2b68b405311a6cea0cf0bda
-  data.tar.gz: b73cfa67cecca1c23b115ef32246c484785cc47906c41cfe3f493ceca2f3e2ae29e40bbfb0d12b9a03ce029902900a2c5a9bdfe32437979df6ed655a770990fb
+  metadata.gz: aba56c9c433c72ee18c7020285a6279718738a948f3b30fb06b92828f90c7a225943448bda49eec17fd7806d93f84e5c1e24b483daf3155c3885e0971a3dd551
+  data.tar.gz: 65a10a6918355ffe0d443acd061a18f89c4f386d135907b4e5b6b32ee373a988fee8b794fd1f9f0e4ead7549eea58cf89780c1a97a8a93a7057f78fa79ba92c8

data/CHANGES.md

@@ -1,4 +1,6 @@
 # Changes
+[1.2.0]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.2.0
+[1.1.4]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.4
 [1.1.3]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.3
 [1.1.2]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.2
 [1.1.1]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.1
@@ -7,6 +9,18 @@
 [1.0.0]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.0.0
 [0.0.3]: https://github.com/sunggun-yu/capitomcat/releases/tag/v0.0.3
 
+## [v1.2.0][1.2.0]
+ * Updating Capistrano dependency version.
+ * Removing background executing of tomcat command. also, sleep time has removed accordingly.
+    * PTY option is not properly applied.
+    * In actually, executing tomcat command in background is not effective. It is all about Tomcat starting command. In most of case, Tomcat init.d command use `/bin/su -p -s /bin/bash -l $TOMCAT_USER $TOMCAT_HOME/bin/startup.sh`. however, In some OS, such like CentOS/Oracle 5.9 and 6.5, tomcat command process were killed right after the ssh session has closed. To prevent this issue, init.d script should be modified like, `su $TOMCAT_USER -c $TOMCAT_HOME/bin/startup.sh`
+ * Adding attribute for Tomcat command waiting timeout. Changing netstat checking logic.
+
+## [v1.1.4][1.1.4]
+ * Adding "cleanup unpacked WAR directory" function before tomcat starting.
+    * Unpacked WAR directory is not refreshed. eventually, Tomcat doesn't provide latest changes in new WAR file by this issue.
+    * Thanks to @jwcarman
+
 ## [v1.1.3][1.1.3]
  * Bug Fix : There was space between "-" and "u" at Tomcat work directory cleaning task.
 

data/capitomcat.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Sunggun Yu']
   s.email       = ['sunggun.dev@gmail.com']
   s.licenses    = ['Apache 2.0']
-  s.date        = %q{2014-03-19}
+  s.date        = %q{2015-01-25}
   s.homepage    = 'http://sunggun-yu.github.io/capitomcat/'
   s.summary     = %q{Capistrano 3 recipe for Tomcat web application deployment}
   s.description = %q{Capitomcat is the Capistrano 3 recipe for Tomcat web application deployment.}
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'capistrano', '>= 3.1.0'
+  s.add_dependency 'capistrano', '~> 3.3', '>= 3.3.5'
 end

data/lib/capitomcat/tasks/deploy.cap

@@ -23,6 +23,8 @@ namespace :capitomcat do
     set   :tomcat_context_path, '/test-web'
     set   :tomcat_context_file, '/var/lib/tomcat7/conf/Catalina/localhost/test-web.xml'
     set   :tomcat_work_dir, '/var/lib/tomcat7/work/Catalina/localhost/test-web'
+    set   :tomcat_cmd_wait_start, 10 # Second
+    set   :tomcat_cmd_wait_stop, 5 # Second
 
     # Deploy setting section
     set   :local_war_file, '/tmp/test-web.war'
@@ -76,45 +78,60 @@ namespace :capitomcat do
   # Start Tomcat server
   def start_tomcat
     # local variables
-    execute_tomcat_cmd('start', 1)
+    execute_tomcat_cmd('start')
   end
 
   # Check status whether Tomcat started
   def check_tomcat_started
     # local variables
-    tomcat_port = fetch(:tomcat_port)
+    tomcat_cmd_wait_start = if fetch(:tomcat_cmd_wait_start).to_s.length > 0
+                              fetch(:tomcat_cmd_wait_start).to_i
+                            else
+                              30 # Default is 30 sec
+                            end
     _times = 0
-    begin
-      _times = _times + 1
-      info("Check and wait until Tomcat starting up ... #{_times}")
-      _netstat = capture("netstat -an | grep \"#{tomcat_port}\" | grep \"LISTEN\" ; echo \"\"")
-      info (_netstat)
+    until check_netstat_tomcat_port do
+      if _times >= tomcat_cmd_wait_start
+        raise 'Tomcat is not started.'
+      end
+      _times += 1
+      info("Check and wait until starting Tomcat ... #{_times}")
       sleep(1)
-    end until _times > 180 || (_netstat != nil && _netstat.to_s.length > 1)
-    if _times > 180
-      raise 'Starting Tomcat has failed - timed out'
     end
   end
 
   # Check status whether Tomcat stopped
   def check_tomcat_stopped
     # local variables
-    tomcat_port = fetch(:tomcat_port)
+    tomcat_cmd_wait_stop = if fetch(:tomcat_cmd_wait_stop).to_s.length > 0
+                              fetch(:tomcat_cmd_wait_stop).to_i
+                            else
+                              5 # Default is 5 sec
+                            end
     _times = 0
-    begin
-      _times = _times + 1
+    until !check_netstat_tomcat_port do
+      if _times >= tomcat_cmd_wait_stop
+        raise 'Tomcat is not stopped.'
+      end
+      _times += 1
       info("Check and wait until Tomcat stopping ... #{_times}")
-      _netstat = capture("netstat -an | grep \"#{tomcat_port}\" | grep \"LISTEN\" ; echo \"\"")
       sleep(1)
-    end until _times > 180 || _netstat == nil || _netstat.to_s.length == 0
-    if _times > 180
-      raise 'Stopping Tomcat has failed - timed out'
+    end
+  end
+
+  # Do netstat -an | grep ${tomcat_port} | grep "LISTEN" to check whether tomcat port is up or not. return when it is up.
+  def check_netstat_tomcat_port
+    tomcat_port = fetch(:tomcat_port)
+    _netstat = capture("netstat -an | grep \"#{tomcat_port}\" | grep \"LISTEN\" ; echo \"\"")
+    info (_netstat)
+    if _netstat.to_s.length > 1
+      return true
     end
   end
 
   # Stop Tomcat server
   def stop_tomcat
-    execute_tomcat_cmd('stop', 1)
+    execute_tomcat_cmd('stop')
   end
 
   # Upload the WAR file
@@ -268,10 +285,10 @@ namespace :capitomcat do
 
   # Execute the Tomcat command
   # it executes the Tomcat command in background. and sleeps for several sec after executing.
-  def execute_tomcat_cmd(arg, sleep)
+  def execute_tomcat_cmd(arg)
     # local variables
     tomcat_cmd = fetch(:tomcat_cmd)
-    execute("echo `nohup sudo #{get_sudo_user_tomcat_cmd} #{tomcat_cmd} #{arg}& > /dev/null 2>&1` && sleep #{sleep}")
+    execute :sudo, get_sudo_user_tomcat_cmd, tomcat_cmd, arg
   end
 
   # Test if dir is existing

data/lib/capitomcat/version.rb

@@ -1,3 +1,3 @@
 module Capitomcat
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Sunggun Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.5
 description: Capitomcat is the Capistrano 3 recipe for Tomcat web application deployment.
 email:
 - sunggun.dev@gmail.com
@@ -88,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Capistrano 3 recipe for Tomcat web application deployment