ztk 0.0.12 → 0.0.14

data/lib/ztk/logger.rb

@@ -80,11 +80,12 @@ module ZTK
     def add(severity, message = nil, progname = nil, &block)
       return if (@level > severity)
 
-      called_by = parse_caller(caller[1])
       msg = (block && block.call)
       (msg.nil? || msg.strip.empty?) and return
+      @hostname ||= %x(hostname -s).chomp.strip
+      called_by = parse_caller(caller[1])
       message = [message, progname, msg].flatten.compact.join(": ")
-      message = "%19s.%06d|%05d|%5s|%s%s\n" % [Time.now.utc.strftime("%Y-%m-%d|%H:%M:%S"), Time.now.utc.usec, Process.pid, SEVERITIES[severity], called_by, message]
+      message = "%19s.%06d|%05d|%5s|%s|%40s%s\n" % [Time.now.utc.strftime("%Y-%m-%d|%H:%M:%S"), Time.now.utc.usec, Process.pid, SEVERITIES[severity], @hostname, called_by, message]
 
       @logdev.write(message)
 

data/lib/ztk/ssh.rb

@@ -123,11 +123,10 @@ module ZTK
       @sftp ||= Net::SFTP.start(@config.host_name, @config.user, ssh_options)
     end
 
-    # Close our sessions gracefully.
+    # Close our session gracefully.
     def close
       log(:debug) { "close" }
-      ssh and ssh.close
-      sftp and sftp.close
+      ssh and !ssh.closed? and ssh.close
     end
 
     # Launches an SSH console, replacing the current process with the console

data/lib/ztk/version.rb

@@ -19,5 +19,5 @@
 ################################################################################
 
 module ZTK
-  VERSION = "0.0.12" unless const_defined?(:VERSION)
+  VERSION = "0.0.14" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -206,18 +206,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3569323308884458346
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3569323308884458346
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -235,4 +229,3 @@ test_files:
 - spec/ztk/ssh_spec.rb
 - spec/ztk/tcp_socket_check_spec.rb
 - spec/ztk/template_spec.rb
-has_rdoc: