webroar 0.2.3 → 0.2.4

data/CHANGELOG

@@ -0,0 +1,25 @@
+v0.2.4 - 01-Dec-2009
+--------------------
+
+* Fixed intermittent crash issue in head while closing client connections 
+by calling close_connection() directly rather than running it through
+goodbye_watcher in libebb.
+* Renamed on_error callback (introduced by us in libebb) to the more 
+appropriate on_request_parse_error.
+* Fixed install issue on ruby 1.9 caused due to invalid multibyte char.
+* Fixed the incorrect month value in the file name format for gcore dumps.
+* Initialized logging for the worker right as it is instantiated before 
+it connects to head process.
+* Cleaned up wr_wkr_create() method in head/wr_worker.c.
+* Print logging level as a string in the log files.
+* Fixed invalid pointer being used in 'wr_req_resolve_http_req' function.
+* Fixed creation of rack.input stream object. Resolves Ticket #2 related to 
+error seen on posting form with enctype="multipart/form-data".
+* Ensured 'starling-starling' gem is used by WebROaR even is 'starling' is 
+present on the system.
+
+v0.2.3 - 25-Nov-2009
+---------------------
+
+* First cut for public.
+

data/lib/user_interaction.rb

@@ -46,7 +46,7 @@ module Webroar
       puts "found."
       gem_name = "WebROaR-" + gem_list[gem_list.length - 1].to_s
       require File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'ruby_interface','version.rb')
-      choice_list = [ "Import configuration, logs and admin panel data from the previous installation – #{gem_name}.",
+      choice_list = ["Import configuration, logs and admin panel data from the previous installation - #{gem_name}.",
         "No import required, install #{Webroar::SERVER} afresh."]
 
       puts ""

data/src/head/wr_application.c

@@ -260,13 +260,18 @@ void wr_app_print(wr_app_t*app) {
 /** Create worker for application */
 int wr_app_wkr_add(wr_app_t *app) {
   if(app->pending_wkr < WR_MAX_PENDING_WKR) {
-    app->pending_wkr++;
-    app->high_ratio = TOTAL_WORKER_COUNT(app) * WR_MAX_REQ_RATIO;
-    app->last_wkr_pid[app->pending_wkr-1] = wr_wkr_create(app->svr, app->conf);
-    ev_timer_again(app->svr->ebb_svr.loop, &app->t_add_timeout);
-    LOG_INFO("PID of created worker = %d, Rails application=%s, ",
+    int retval = wr_wkr_create(app->svr, app->conf);
+    if(retval > 0){
+      app->pending_wkr++;
+      app->high_ratio = TOTAL_WORKER_COUNT(app) * WR_MAX_REQ_RATIO;
+      app->last_wkr_pid[app->pending_wkr-1] = retval;
+      ev_timer_again(app->svr->ebb_svr.loop, &app->t_add_timeout);
+      LOG_INFO("PID of created worker = %d, Rails application=%s, ",
              app->last_wkr_pid[app->pending_wkr-1],app->conf->path.str);
-    return 0;
+      return 0;
+    }else{
+      LOG_ERROR(SEVERE,"Could not fork process to start new worker.");
+    }
   }
   return -1;
 }

data/src/head/wr_config.h

@@ -81,7 +81,7 @@
 // File to store Server process id
 #define WR_PID_FILE  "/var/run/webroar.pid"
 #define WR_SERVER "WebROaR"
-#define WR_VERSION "0.2.3"
+#define WR_VERSION "0.2.4"
 #define WR_MIME_TYPE_PATH "/conf/mime_type.yml"
 #define WR_CONF_PATH "/conf/config.yml"
 #define WR_SERVER_INTERNAL_CONF_PATH "/conf/server_internal_config.yml"

data/src/head/wr_connection.c

@@ -101,7 +101,7 @@ void wr_conn_after_write_cb(ebb_connection *connection) {
 }
 
 /** The connection got parser error */
-void wr_conn_err_cb(ebb_connection* connection) {
+void wr_req_parse_err_cb(ebb_connection* connection) {
   LOG_FUNCTION
 
   wr_conn_t* conn = (wr_conn_t*)connection->data;
@@ -183,7 +183,7 @@ wr_conn_t* wr_conn_new(wr_svr_t *server) {
   connection->new_request = wr_new_req_cb;
   connection->on_close = wr_conn_close_cb;
   connection->on_timeout = wr_conn_timeout_cb;
-  connection->on_error = wr_conn_err_cb;
+  connection->on_request_parse_error = wr_req_parse_err_cb;
 
   return a_connection;
 }

data/src/head/wr_main.c

@@ -222,7 +222,6 @@ int main(int argc, char *argv[]) {
 #ifdef L_DEBUG
   set_log_severity(DEBUG);
 #else
-
   set_log_severity(conf->server->log_level);
 #endif
   // Add Admin Panel

data/src/head/wr_resolver.c

@@ -244,7 +244,7 @@ int wr_req_resolve_http_req(wr_svr_t *server, wr_req_t *req) {
     }
   }
   /* resolve host name */
-  if(app == NULL) {
+  if(app == NULL && server->resolver->hosts) {
     scgi_header_t *http_host = scgi_header_get(req->scgi, "HTTP_HOST");
     if(http_host) {
       wr_str_t host_str;
@@ -252,7 +252,7 @@ int wr_req_resolve_http_req(wr_svr_t *server, wr_req_t *req) {
       char *value = req->scgi->header + http_host->value_offset;
 
       //removing port
-      char *ptr = memchr(http_host, ':', http_host->value_length);
+      char *ptr = memchr(value, ':', http_host->value_length);
       if(ptr) {
         wr_string_new(host_str, value, ptr - value);
       } else {

data/src/head/wr_worker.c

@@ -561,7 +561,6 @@ int wr_wkr_create(wr_svr_t *server, wr_app_conf_t *app_conf) {
   pid = fork();
   LOG_DEBUG(DEBUG,"Forked PID is  %i, uid = %s, gid =%s, app = %s",pid, cuid_s, cgid_s, app_conf->name.str) ;
   if (pid == 0) {
-    if (pid == 0) {
       LOG_DEBUG(3,"Child is continuing %i",pid);
       setsid();
       int i = 0;
@@ -605,17 +604,6 @@ int wr_wkr_create(wr_svr_t *server, wr_app_conf_t *app_conf) {
         fflush(stderr);
         _exit(1);
       }
-
-    } else if (pid == -1) {
-      wr_string_free(baseuri);
-      perror("Cannot fork a new process");
-      LOG_ERROR(5,"Cannot fork a new process");
-      fflush(stderr);
-      _exit(1);
-    } else {
-      wr_string_free(baseuri);
-      _exit(0);
-    }
   } else if (pid == -1) {
     wr_string_free(baseuri);
     LOG_ERROR(5,"Cannot fork a new process %i", errno);
@@ -624,7 +612,7 @@ int wr_wkr_create(wr_svr_t *server, wr_app_conf_t *app_conf) {
     //Temporary Hack
     return pid;
   }
-  return 0;
+  return -1;
 }
 
 /** Request callback called by ebb Request*/

data/src/helper/wr_logger.c

@@ -137,6 +137,18 @@ void a_error(LOG_SEVERITY level, const char *file_name, int line_no, const char
   }
 }
 
+/** Get log level string */
+char* get_log_level_string(LOG_SEVERITY level){
+  switch(level){
+  case DEBUG: return "DEBUG";
+  case INFO: return "INFO";
+  case WARN: return "WARN";
+  case SEVERE: return "SEVERE";
+  case FATAL: return "FATAL";
+  default: "Unknown";
+  }
+}
+
 /** Get logging severity */
 LOG_SEVERITY get_log_severity(const char*str) {
   if(strcmp(str,"DEBUG") == 0) {
@@ -163,6 +175,6 @@ int change_log_file_owner(int user_id, int group_id) {
 
 /** Set logging level */
 int set_log_severity(int severity) {
-  LOG_INFO("setting log level to %d",severity);
+  LOG_INFO("setting log level to %s", get_log_level_string(severity));
   logging_level = severity;
 }

data/src/helper/wr_util.c

@@ -158,6 +158,6 @@ int get_timestamp(char *str) {
     LOG_ERROR(SEVERE, "Error detected in localtime()");
     return -1; 
   }  
-  sprintf(str, "%d-%d-%d-%d-%d-%d", tm_struct->tm_year + 1900, tm_struct->tm_mon, tm_struct->tm_mday, tm_struct->tm_hour, tm_struct->tm_min, tm_struct->tm_sec);  
+  sprintf(str, "%d-%d-%d-%d-%d-%d", tm_struct->tm_year + 1900, tm_struct->tm_mon + 1, tm_struct->tm_mday, tm_struct->tm_hour, tm_struct->tm_min, tm_struct->tm_sec);
   return 0;
 }

data/src/ruby_lib/analyzer/message_reader.rb

@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
+gem 'starling-starling', '>=0.10.0'
 require 'starling'
 
 module Webroar

data/src/ruby_lib/profiler/message_dispatcher.rb

@@ -17,6 +17,7 @@
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'singleton'
+gem 'starling-starling', '>=0.10.0'
 require 'starling'
 require 'yaml'
 module Webroar

data/src/ruby_lib/ruby_interface/request_body.rb

@@ -24,18 +24,17 @@ module Webroar
       @client = client
     end
     
-    def read(len = nil)
+    def read(len = nil, s = '')
       if @io
         @io.read(len)
       else
-        if len.nil?
-          s = ''
+        if len.nil?          
           while(chunk = read(10*1024))
             s << chunk
           end
           s
         else
-          Webroar::read_request(@client, len)
+          s = Webroar::read_request(@client, len)
         end
       end
     end

data/src/ruby_lib/ruby_interface/version.rb

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

data/src/vendor/libebb/ebb.c

@@ -322,8 +322,8 @@ on_readable(struct ev_loop *loop, ev_io *watcher, int revents)
   /* parse error? just drop the client. screw the 400 response */
 //  if(ebb_request_parser_has_error(&connection->parser)) goto error;
   if(ebb_request_parser_has_error(&connection->parser)){
-  	if(connection->on_error){
-	  	connection->on_error(connection);
+  	if(connection->on_request_parse_error){
+	  	connection->on_request_parse_error(connection);
   	}else{
   		ebb_connection_schedule_close(connection);
   	}
@@ -756,7 +756,7 @@ ebb_connection_init(ebb_connection *connection)
   connection->new_request = NULL;
   connection->on_timeout = NULL;
   connection->on_close = NULL;
-  connection->on_error = NULL;
+  connection->on_request_parse_error = NULL;
   connection->data = NULL;
 }
 
@@ -770,7 +770,11 @@ ebb_connection_schedule_close (ebb_connection *connection)
     return;
   }
 #endif
-  ev_timer_start(connection->server->loop, &connection->goodbye_watcher);
+  //ev_timer_start(connection->server->loop, &connection->goodbye_watcher);
+  // Why do we need to start a timer which would to execute after 0. second?
+  // Looks timer is creating problem(not able to reproduce it on development machine) like
+  // few time its giving on_goodbye callback twice and causing server crash
+  close_connection(connection);
 }
 
 /* 

data/src/vendor/libebb/ebb.h

@@ -100,7 +100,7 @@ struct ebb_connection {
 
   void (*on_close) (ebb_connection*);
   
-  void (*on_error) (ebb_connection*);
+  void (*on_request_parse_error) (ebb_connection*);
 
   void *data;
 };

data/src/worker/wkr_main.c

@@ -148,7 +148,7 @@ static inline wkr_tmp_t* parse_args(int argc, char **argv) {
   extern char *optarg;
   size_t len;
   char *str;
-  int invalid_arg_flag = 0, app_path_flag = 0;
+  int invalid_arg_flag = 0, app_path_flag = 0, log_level = INFO;
   wkr_tmp_t *tmp = wkr_tmp_new();
 
   if(tmp == NULL)
@@ -171,14 +171,7 @@ static inline wkr_tmp_t* parse_args(int argc, char **argv) {
       wr_string_new(tmp->env, str, len);
       break;
     case 'l':  // Logging level
-#ifdef L_DEBUG
-
-      set_log_severity(DEBUG);
-#else
-
-      set_log_severity(atoi(optarg));
-#endif
-
+      log_level = atoi(optarg);
       break;
     case 'f':  // Log file name
       wr_string_free(tmp->log_file);
@@ -227,8 +220,21 @@ static inline wkr_tmp_t* parse_args(int argc, char **argv) {
       invalid_arg_flag++;
     }
   }
-  if (invalid_arg_flag>0 || app_path_flag == 0) {
+
+  if(tmp->log_file.str){
+    initialize_logger(tmp->log_file.str);
+#ifdef L_DEBUG
+      set_log_severity(DEBUG);
+#else
+      set_log_severity(log_level);
+#endif
+  }else{
+    perror("Log file is not specified.");
+  }
+
+  if (invalid_arg_flag > 0 || app_path_flag == 0) {
     print_usage(argv[0]);
+    LOG_ERROR(SEVERE, "Either argument is invalid or application path is not passed.");
     wkr_tmp_free(&tmp);
     return NULL;
   }
@@ -277,7 +283,7 @@ int main(int argc, char **argv) {
   int port, retval = 0;
   wkr_t* w = NULL;
 
-  if(argc==1) {
+  if(argc == 1) {
     print_usage(argv[0]);
     return -1;
   }
@@ -289,18 +295,15 @@ int main(int argc, char **argv) {
 //  signal(SIGFPE, crash_handler);
   
   wkr_tmp_t *tmp = parse_args(argc, argv);
-
   if(tmp == NULL)
     return -1;
-
+  
   loop = ev_default_loop (0);
+
   w = worker_new(loop, tmp);
   if(w==NULL)
     goto err;
   worker = w;
-  //  assert(w!=NULL);
-
-  initialize_logger(w->tmp->log_file.str);
   redirect_standard_io();
   
   LOG_DEBUG(DEBUG,"control path = %s, Application baseuri = %s",

data/tasks/gem.rake

@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'starling-starling', '>=0.10.0'
   
   s.files = FileList['Rakefile',    
-#    'CHANGELOG',
+    'CHANGELOG',
     'COPYING',
     File.join('bin', 'webroar'),
     File.join('bin', 'webroar-analyzer'),