right_support 2.4.0 → 2.4.1

data/lib/right_support/rack/request_logger.rb

@@ -97,13 +97,15 @@ module RightSupport::Rack
         sess = ""
       end
 
+      shard_info = 'Shard: ' + (env['HTTP_X_SHARD'] || 'default').to_s + ';'
+
       params = [
         env["REQUEST_METHOD"],
         env["PATH_INFO"],
         query_info,
         remote_addr,
         sess,
-        'Shard_id:' + (env['HTTP_X_SHARD'] || 'not set').to_s + ';',
+        shard_info,
         env["rack.request_uuid"] || ''
       ]
 

data/lib/right_support/stats/helpers.rb

@@ -220,8 +220,8 @@ module RightSupport
     #
     # === Parameters
     # stats(Hash):: Statistics with generic keys "name", "identity", "hostname", "revision", "service uptime",
-    #   "machine uptime", "memory KB", "stat time", "last reset time", "version", and "broker" with
-    #   the latter two and "revision", "machine uptime", "memory KB", "version", and "broker" being optional;
+    #   "machine uptime", "memory KB", "stat time", "last reset time", "version", and "brokers" with
+    #   "revision", "machine uptime", "memory KB", "version", and "brokers" being optional;
     #   any other keys ending with "stats" have an associated hash value that is displayed in sorted
     #   key order, unless "stats" is preceded by a non-blank, in which case that character is prepended
     #   to the key to drive the sort order
@@ -243,7 +243,7 @@ module RightSupport
       end
       str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "stat time", time_at(stats["stat time"], with_year = true)) +
              sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "last reset", time_at(stats["last reset time"], with_year = true)) +
-             sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "service up", elapsed(stats["service uptime"]))
+             sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "service up", service_up_str(stats["service uptime"]))
       if stats.has_key?("machine uptime")
         str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "machine up", elapsed(stats["machine uptime"]))
       end
@@ -262,6 +262,30 @@ module RightSupport
       str
     end
 
+    # Converts service uptime stats to displayable format
+    #
+    # === Parameters
+    # stats(Integer|Hash):: Service uptime in seconds if an Integer, otherwise a Hash containing
+    #   "uptime", "total_uptime", "restarts", "graceful_exits", "crashes", and "last_crash_time" values
+    #
+    # === Return
+    # (String):: Service uptime display
+    def self.service_up_str(stats)
+      if stats.is_a?(Integer)
+        elapsed(stats)
+      else
+        str = elapsed(stats["uptime"])
+        if (r = stats["restarts"]) && r > 0
+          non_graceful = (n = r - stats["graceful_exits"]) > 0 ? "#{n} non-graceful, " : ""
+          str += ", restarts: #{r} (#{non_graceful}up #{elapsed(stats["total_uptime"])} total)"
+        end
+        if (c = stats["crashes"]) && c > 0
+          str += ", crashes: #{c} (last #{elapsed(Time.now.to_i - stats["last_crash_time"])} ago)"
+        end
+        str
+      end
+    end
+
     # Convert broker information to displayable format
     #
     # === Parameter

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.4.0'
-  s.date    = '2012-09-17'
+  s.version = '2.4.1'
+  s.date    = '2012-09-18'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Tony Spataro
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-17 00:00:00 -07:00
+date: 2012-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: []