webs 0.1.15 → 0.1.16

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.15') do |p|
+Echoe.new('webs', '0.1.16') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/controller/alive_controller.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 class Webs::AliveController < ActionController::Base
   def index
     # Returns a 500 before ever getting here if cannot connect to database
@@ -8,34 +10,26 @@ class Webs::AliveController < ActionController::Base
     response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
 
     # Only force down if calling from localhost
-    render( :text=>'OK' ) and return if !request.local?
-    if Webs.cache
-      require 'socket'
-      this_host = Socket.gethostname
-      ENV.keys.sort.each{ |k| Rails.logger.debug "ENV #{k} = #{ENV[k]}"}
-      request.headers.keys.sort.each{ |k| Rails.logger.debug "HEADER #{k} = #{request.headers[k]}"}
-      key = "alive_#{this_host}"
-      Rails.logger.debug "********** Checking Cache for Server Down: #{key}"
-      server_down = Webs.cache.read(key)
-      if server_down.nil? && ['1', '-1'].include?( params['forceDown'])
+    render( :text=>'OK' ) and return unless Webs.cache
+
+    this_host = Socket.gethostname
+    key = "alive_#{this_host}"
+
+    server_down = Webs.cache.read(key)
+    if request.local?
+      if ['1', '-1'].include?( params['forceDown'] )
         server_down = '1'
         Webs.cache.write(key, server_down)
-      elsif server_down && params['forceDown'] == '0'
+      elsif params['forceDown'] == '0'
         Webs.cache.delete(key)
         server_down = nil
       end
-      Rails.logger.debug "********** Server Down?: #{server_down}"
-      if server_down
-        render :text=>"Server is going down!", :status=>503 
-      else
-        render :text=>'OK'
-      end
+    end
+    
+    if server_down
+      render :text=>"Server is going down!", :status=>503 
     else
-      if ['1', '-1'].include?( params['forceDown']) 
-        render :text=>"Server is going down!", :status=>503 
-      else
-        render :text=>'OK'
-      end
+      render :text=>'OK'
     end
   end
 end

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.15'.freeze
+  VERSION = '0.1.16'.freeze
 
 #  def self.load_constants
     # s = File.read("#{Pathname(__FILE__).dirname.expand_path}/config/webs_constants.yml")

data/webs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Chuck Olczak