webs 0.1.14 → 0.1.15

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.14') do |p|
+Echoe.new('webs', '0.1.15') 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

@@ -0,0 +1,41 @@
+class Webs::AliveController < ActionController::Base
+  def index
+    # Returns a 500 before ever getting here if cannot connect to database
+
+    # avoid cache & 304, always return 200
+    response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+    response.headers["Pragma"] = "no-cache"
+    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'])
+        server_down = '1'
+        Webs.cache.write(key, server_down)
+      elsif server_down && 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
+    else
+      if ['1', '-1'].include?( params['forceDown']) 
+        render :text=>"Server is going down!", :status=>503 
+      else
+        render :text=>'OK'
+      end
+    end
+  end
+end

data/lib/controller/info_controller.rb

@@ -0,0 +1,8 @@
+class Webs::InfoController < ActionController::Base
+  include Webs::Controller::WebsController
+  webs_helpers
+
+  def index
+    render :partial=>'shared/webs_info'
+  end
+end

data/lib/controller/webs_controller.rb

@@ -83,10 +83,6 @@ module Webs
         render :text => render_text
       end
 
-      def webs_info
-        render :partial=>'shared/webs_info'
-      end
-
       # FILTERS
       def set_page_title
         @title = Webs::app_title
@@ -102,8 +98,8 @@ module Webs
       end
 
       def validate_webs_session
-        render :text => "Access Denied: Webs::SECRET not defined." and return(false) unless defined?( Webs::SECRET )
-        render :text => "Access Denied" and return(false) unless fw_sig == webs_auth( Webs::SECRET )
+        render( :text => "Access Denied: Webs::SECRET not defined.", :status=>403 ) and return(false) unless defined?( Webs::SECRET )
+        render( :text => "Access Denied", :status=>403 ) and return(false) unless fw_sig == webs_auth( Webs::SECRET )
       end
       
       def require_webs_user
@@ -111,7 +107,7 @@ module Webs
       end
       
       def require_webs_admin
-        render(:text => "You are not authorized.") unless webs_admin?
+        render( :text => "You are not authorized.", :status=>403 ) unless webs_admin?
       end
       
       def require_sitebuilder

data/lib/webs.rb

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

data/webs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-02-04}
+  s.date = %q{2011-02-09}
   s.description = %q{Reusable webs stuff.}
   s.email = %q{chuck@webs.com}
   gemfiles = [
@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
       "lib/config/webs_constants.rb", 
       "lib/config/webs_initializer.rb", 
       "lib/controller/url_for_context_path.rb", 
+      "lib/controller/alive_controller.rb", 
+      "lib/controller/info_controller.rb", 
       "lib/controller/webs_controller.rb", 
       "lib/helper/application.rb", 
       "lib/helper/params.rb", 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ extra_rdoc_files:
 - lib/config/webs_constants.rb
 - lib/config/webs_initializer.rb
 - lib/controller/url_for_context_path.rb
+- lib/controller/alive_controller.rb
+- lib/controller/info_controller.rb
 - lib/controller/webs_controller.rb
 - lib/helper/application.rb
 - lib/helper/params.rb
@@ -47,6 +49,8 @@ files:
 - lib/config/webs_constants.rb
 - lib/config/webs_initializer.rb
 - lib/controller/url_for_context_path.rb
+- lib/controller/alive_controller.rb
+- lib/controller/info_controller.rb
 - lib/controller/webs_controller.rb
 - lib/helper/application.rb
 - lib/helper/params.rb