webroar 0.3.1 → 0.4.0

data/src/helper/wr_scgi.c

@@ -28,7 +28,6 @@
 #include "wr_logger.h"
 
 #define SCGI_START_OFFSET 40
-#define SCGI_CONTENT_LENGTH "CONTENT_LENGTH"
 #define SCGI_CONTENT_LENGTH_LEN    14
 
 #define SCGI_HEADER_BLOCK_SIZE 2048
@@ -109,7 +108,7 @@ int scgi_header_add(scgi_t* scgi, const char* field, size_t field_len, const cha
   header->next = scgi->header_list;
   scgi->header_list = header;
   
-  LOG_DEBUG(DEBUG, "%s:%s", scgi->header + header->field_offset, scgi->header + header->value_offset);
+  //LOG_DEBUG(DEBUG, "%s:%s", scgi->header + header->field_offset, scgi->header + header->value_offset);
   
   return 0;
 }
@@ -332,7 +331,7 @@ scgi_t* scgi_parse(const char *buffer, size_t length){
         state = STATE_HEADER;
         field_offset = i + 1;
         field_len = value_len = 0;
-        LOG_DEBUG(DEBUG, "Header %s:%s", buffer + header->field_offset, buffer + header->value_offset);
+        //LOG_DEBUG(DEBUG, "Header %s:%s", buffer + header->field_offset, buffer + header->value_offset);
       }
       break;
     case STATE_BODY:  // Process request body
@@ -421,4 +420,4 @@ scgi_header_t* scgi_header_get(scgi_t* scgi, const char *field){
     header = header->next;
   }
   return NULL;
-}
+}

data/src/helper/wr_scgi.h

@@ -30,6 +30,8 @@
 
 #include <stdio.h>
 
+#define SCGI_CONTENT_LENGTH "CONTENT_LENGTH"
+
 typedef struct scgi_header_s scgi_header_t;
 
 /** SCGI request type */

data/src/helper/wr_string.h

@@ -36,8 +36,8 @@ typedef struct {
 #define wr_string_is_empty(_str) _str.str == NULL
 #define wr_string_new(_str,str1,_len) _str.len = _len; _str.str = (char*) malloc(sizeof(char)*(_len+1)); memcpy(_str.str, str1, _len); _str.str[_len] = 0
 #define wr_string_null(_str) _str.len = 0; _str.str = NULL
-#define wr_string_append(_str, str1, _len)  char *str2 =(char*) realloc(_str.str,sizeof(char)*(_str.len+_len+1));\
-        if(str2){memcpy(str2+_str.len, str1, _len); _str.len+=_len;str2[_str.len]=0;_str.str=str2;}
+#define wr_string_append(_str, str1, _len)  {char *str2 =(char*) realloc(_str.str,sizeof(char)*(_str.len+_len+1));\
+        if(str2){memcpy(str2+_str.len, str1, _len); _str.len+=_len;str2[_str.len]=0;_str.str=str2;}}
 #define wr_string_free(_str) if(_str.str) free(_str.str); _str.len = 0; _str.str = NULL
 #define wr_string_dump(_str,_str1) _str.len = _str1.len;_str.str = (char*) malloc(sizeof(char)*(_str.len+1)); memcpy(_str.str, _str1.str, _str.len); _str.str[_str.len] = 0
 

data/src/helper/wr_util.c

@@ -138,7 +138,9 @@ time_t httpdate_to_c_time(const char *httpdate){
     //LOG_DEBUG(DEBUG,"Counld not parse httpdate %s.", httpdate);
     return -1;
   }
-  return mktime(&tm_info);
+
+  //return mktime(&tm_info);
+  return timegm(&tm_info);
 }
 
 /** Convert C 'time_t' to HTTP date */

data/src/helper/wr_yaml_parser.c

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <wr_yaml_parser.h>
+#include <wr_logger.h>
 
 /** Free node */
 void node_free(node_t* node) {
@@ -247,3 +248,32 @@ node_t* yaml_parse(const char*file_name) {
     return NULL;
   }
 }
+
+/** Validate YAML tokens */
+char* wr_validate_string(const char* str) {
+  int count, len, is_blank, is_comment;
+
+  if(str == NULL)
+    return NULL;
+
+  //Set flags
+  is_blank = 1;
+  is_comment = 0;
+  len = strlen(str);
+  for(count = 0; count < len ; count++) {
+    //check for blank value
+    if(str[count] != ' ') {
+      is_blank = 0;
+    }
+    //check for comment '#' character
+    if(str[count] == '#') {
+      is_comment = 1;
+      break;
+    }
+  }
+  if(is_comment || is_blank) {
+    LOG_ERROR(SEVERE,"Invalid token.");
+    return NULL;
+  }
+  return (char*)str;
+}

data/src/helper/wr_yaml_parser.h

@@ -63,5 +63,6 @@ node_t* yaml_parse(const char*);
 node_t* get_nodes(node_t *root, char* xpath);
 char* get_node_value(node_t *root, char* xpath);
 void node_free(node_t* node);
+char* wr_validate_string(const char* str);
 
 #endif /*WR_YAML_PARSER_H_*/

data/src/ruby_lib/exception_tracker/instrumentation/action_controller.rb

@@ -18,7 +18,8 @@
 
 module Webroar
   module ExceptionTracker
-    trace_rescue_action(:rescue_action, ActionController::Rescue, 'i')
+    trace_rescue_action(:rescue_action, ActionController::Rescue, 'i') if ::Rails::VERSION::MAJOR < 3
+    trace_rescue_action(:rescue_with_handler, ActionController::Base, 'i') if ::Rails::VERSION::MAJOR > 2
   end # ExceptionTracker
 end # Webroar
 

data/src/ruby_lib/mailer/smtpmail.rb

@@ -40,20 +40,23 @@ module Email
           :password=>data['smtp']['password']}
         from = data['smtp']['from']
         recipients = data['smtp']['recipients']
-        ActionMailer::Base.smtp_settings = details
-        mail_configuration=true
+        ActionMailer::Base.smtp_settings = details        
       else
         details ={:location=>data['sendmail']['location'],
           :arguments=>"-i -t -f"}
         from = data['sendmail']['from']
         recipients = data['sendmail']['recipients']
-        ActionMailer::Base.sendmail_settings = details
-        mail_configuration=true
+        ActionMailer::Base.sendmail_settings = details        
       end
     rescue
       mail_configuration=false
       nil
     end
+    if data and data['email_notification'] and data['email_notification'].downcase == 'enabled'
+      mail_configuration = true
+    else
+      mail_configuration = false
+    end
     return from,recipients,mail_configuration
   end
   class EmailHandler < ActionMailer::Base

data/src/ruby_lib/profiler/instrumentation/action_controller.rb

@@ -18,7 +18,8 @@
 
 module Webroar
   module Profiler
-    trace_perform_action_equivalent(:perform_action, ActionController::Base, 'i')
+    trace_perform_action_equivalent(:perform_action, ActionController::Base, 'i') if ::Rails::VERSION::MAJOR < 3
+    trace_perform_action_equivalent(:process_action, ActionController::Base, 'i') if ::Rails::VERSION::MAJOR > 2
     trace_render_equivalent(:render, ActionController::Base, 'i')
   end # Profiler
 end # Webroar

data/src/ruby_lib/profiler/instrumentation/active_record.rb

@@ -22,6 +22,9 @@ module Webroar
     trace_database_method(:delete_all, ActiveRecord::Base, 'c')
     trace_database_method(:save, ActiveRecord::Base, 'i')
     trace_database_method(:destroy, ActiveRecord::Base, 'i')
+    trace_database_method(:all, ActiveRecord::Base, 'c')  if ::Rails::VERSION::MAJOR > 2
+    trace_database_method(:first, ActiveRecord::Base, 'c')  if ::Rails::VERSION::MAJOR > 2
+    trace_database_method(:last, ActiveRecord::Base, 'c')  if ::Rails::VERSION::MAJOR > 2
     
     # Comment out following lines, if you not interested in detailed analysis of ActiveRecord Models
 #    exclude_list = [Object, ActiveRecord::Base]

data/src/ruby_lib/rack/adapter/rails.rb

@@ -27,23 +27,30 @@ module Webroar
         
         @rails_app = if defined?(ActionController::Dispatcher) and ActionController::Dispatcher.instance_methods.include?('call')
           ActionController::Dispatcher.new
+        elsif ::Rails::VERSION::MAJOR >= 3
+          ::Rails.application
         else
           CgiApp.new
         end
         
-        @file_server = ::Rack::File.new(::File.join(RAILS_ROOT, "public"))
+        @file_server = ::Rack::File.new(::File.join(@root, "public"))
       end
       
       def load_application
         ENV['RAILS_ENV'] = @env
         
         require "#{@root}/config/environment"
-        require 'dispatcher'        
-        if ActionController::Base.respond_to?('relative_url_root=') 
-          ActionController::Base.relative_url_root = @prefix # new way to set the relative URL in Rails 2.1.1 
-        else 
-          ActionController::AbstractRequest.relative_url_root = @prefix
-        end 
+#        TODO: figure out way to set relative URL, following is not working on Rails3-beta4 for stylesheet_link_tag, javascript_include_tag
+        if ::Rails::VERSION::MAJOR >= 3
+          ::Rails.application.config.relative_url_root = @prefix
+        else
+          require 'dispatcher'
+          if ActionController::Base.respond_to?('relative_url_root=') 
+            ActionController::Base.relative_url_root = @prefix # new way to set the relative URL in Rails 2.1.1 
+          else 
+            ActionController::AbstractRequest.relative_url_root = @prefix
+          end
+        end
       end
       
       # TODO refactor this in File#can_serve?(path) ??

data/src/ruby_lib/ruby_interface/client.rb

@@ -21,7 +21,7 @@
 module Webroar
   class Client
     BASE_ENV = {
-      SERVER_NAME => Webroar,
+      SERVER_NAME => WEBROAR,
       SCRIPT_NAME => EMPTY_STRING,
       QUERY_STRING => EMPTY_STRING,
       SERVER_SOFTWARE => Webroar::SERVER,

data/src/ruby_lib/ruby_interface/version.rb

@@ -20,8 +20,8 @@ module Webroar
   
   module VERSION #:nodoc:
     MAJOR    = "0"
-    MINOR    = "3"
-    TINY      = "1"
+    MINOR    = "4"
+    TINY     = "0"
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/src/ruby_lib/webroar_app_loader.rb

@@ -51,12 +51,14 @@ begin
       #    STDERR.sync = true
       #    puts '...........file opened..............'
       require File.join(File.dirname(__FILE__), 'profiler', 'message_dispatcher') #to send pid of worker
-      if $pid_sent and $g_options["app_name"].strip != 'Admin Panel'
+#      TODO: Add Exception tracking for Rails 3
+      if $pid_sent and $g_options["app_name"].strip != 'Admin Panel' and $g_options["app_type"] == "rails" 
         require File.join(File.dirname(__FILE__), 'exception_tracker', 'webroar_exception.rb')
       else
         Webroar.log_info("Exception notification would not work.")
       end
-      if $g_options["app_profiling"] == "yes"
+#      TODO: Add profiling support for Rails 3
+      if $g_options["app_profiling"] == "yes" and $g_options["app_type"] == "rails"  
         if $pid_sent
           require File.expand_path(File.join($g_options["webroar_root"], 'src', 'ruby_lib', 'profiler', 'webroar_profiling.rb'))     
         else