webroar 0.3.1 → 0.4.0

data/src/head/wr_configurator.h

@@ -21,129 +21,24 @@
 
 #include<wr_helper.h>
 
-/** Configuration parameter macros */
-#define WR_CONF_SVR_PORT           "Server Specification/port"
-#define WR_CONF_SVR_MAX_WKR       "Server Specification/max_worker"
-#define WR_CONF_SVR_MIN_WKR       "Server Specification/min_worker"
-#define WR_CONF_SVR_LOG_LEVEL       "Server Specification/log_level"
-#define WR_CONF_SVR_ACCESS_LOG     "Server Specification/access_log"
-
-#define WR_CONF_SVR_SSL_SUPPORT    "Server Specification/SSL Specification/ssl_support"
-
-#ifdef HAVE_GNUTLS
-#define WR_CONF_SVR_SSL_CERTIFICATE   "Server Specification/SSL Specification/certificate_file"
-#define WR_CONF_SVR_SSL_KEY         "Server Specification/SSL Specification/key_file"
-#define WR_CONF_SVR_SSL_PORT      "Server Specification/SSL Specification/ssl_port"
-#endif
-
-#define WR_CONF_APP_SPEC           "Application Specification"
-#define WR_CONF_APP_NAME           "name"
-#define WR_CONF_APP_BASE_URI       "baseuri"
-#define WR_CONF_APP_PATH           "path"
-#define WR_CONF_APP_TYPE           "type"
-#define WR_CONF_APP_ANALYTICS       "analytics"
-#define WR_CONF_APP_USER           "run_as_user"
-#define WR_CONF_APP_ENV           "environment"
-#define WR_CONF_APP_LOG_LEVEL       "log_level"
-#define WR_CONF_APP_MAX_WKR       "max_worker"
-#define WR_CONF_APP_MIN_WKR       "min_worker"
-#define WR_CONF_APP_HOST_NAMES    "host_names"
-
-#define WR_CONF_MAX_LEN_APP_NAME  30
-#define WR_CONF_MAX_LEN_USR_NAME  30
-
-// using 'AF_UNIX' macro to identify UDS support.
-//#define WR_CONF_UDS    1
-
-typedef enum wr_host_type_e{
-  WR_HOST_TPE_INVALID                  = 0,
-  WR_HOST_TYPE_STATIC                  = 1,
-  WR_HOST_TYPE_WILDCARD_IN_START      = 2,
-  WR_HOST_TYPE_WILDCARD_IN_END        = 4,
-  WR_HOST_TYPE_WILDCARD_IN_START_END   = 8,
-}wr_host_type_t;
-
-typedef struct wr_host_name_s  wr_host_name_t;
-struct wr_host_name_s {
-  wr_str_t        name;
-  wr_host_type_t    type;
-  wr_host_name_t   *next;
-};
-
-#define WR_SVR_ACCESS_LOG    1
-#define WR_SVR_SSL_SUPPORT  2
-
-
-/** server_configuration structure */
-typedef struct {
-  wr_u_int     port;              /**< Server port*/
-  wr_u_short    min_worker;    /**< Default number of minimum workers */
-  wr_u_short    max_worker;    /**< Default number of maximum workers */
-  LOG_SEVERITY   log_level;  /**< Logging level */
-  //If WR_CONF_UDS is 1 'contol_sock_path' has UDS sock path
-  //If WR_CONF_UDS is 0 'port' has Internet socket port
-  wr_u_short    ctl_port;          /**< Server control port*/
-  wr_str_t      sock_path;    /**< Server control socket path in case of UNIX domain socket*/
-#ifdef HAVE_GNUTLS
-
-  wr_str_t      certificate;    /**< Certificate path */
-  wr_str_t      key;        /**< Key path */
-  wr_u_short    ssl_port;      /**< SSL listening port */
-#endif
-
-  short         flag;
-}wr_svr_conf_t;
-
-/** application_configuration structure */
-typedef struct wr_app_conf_s  wr_app_conf_t;
-struct wr_app_conf_s {
-  wr_str_t      name;        /**< Application name */
-  wr_str_t      path;  /**< Application path */
-  wr_str_t      env;    /**< Application environment */
-  wr_str_t      type;        /**< Application type {rails, merb etc.}*/
-  short        analytics;      /**< analytics flag {enabled/disabled} */
-  wr_str_t      baseuri;      /**< Application baseuri */
-  wr_u_short     min_worker;       /**< Minimum number of workers required */
-  wr_u_short    max_worker;      /**< Maximum number of workers */
-  LOG_SEVERITY   log_level;    /**< Logging level */
-  short        cuid;        /**< User id */
-  short        cgid;        /**< Group id */
-  wr_host_name_t   *host_name_list;
-  wr_app_conf_t     *next;
-};
-
-typedef struct wr_conf_s  wr_conf_t;
 /** Remove application_configuration from configuration */
-int wr_app_conf_remove(wr_conf_t*, const char *app_name);
+int wr_app_conf_remove(const char *app_name);
 /** Read application configuration of specified application name */
-wr_app_conf_t* wr_conf_app_read(wr_conf_t*, const char *app_name, char* err_msg);
-/** Read and update specified application */
-wr_app_conf_t* wr_conf_app_update(wr_conf_t* conf, const char *app_name, char* err_msg);
-/** Replace the application configuration */
-int wr_conf_app_replace(wr_conf_t *conf, wr_app_conf_t *app_conf);
+config_application_list_t* wr_conf_app_read(const char *app_name, char* err_msg, int flag);
+/** Update application configuration with new parameters */
+int wr_conf_app_update(config_application_list_t *app);
 /** Destroy application configuration */
-void wr_conf_app_free(wr_app_conf_t* app);
+void wr_conf_app_free(config_application_list_t* app);
 
-/** configuration structure */
-struct wr_conf_s {
-  wr_svr_conf_t    *server;    /**< Server configuration */
-  wr_app_conf_t     *apps;  /**< Application configuration */
-  wr_str_t        wr_root_path;      /**< WebROaR root path */
-  wr_str_t        wkr_exe_path;  /**< worker's executable path*/
-  wr_str_t        ruby_lib_path;        /**< Ruby library path */
-  wr_str_t        config_file_path;      /**< Configuration file path */
-  wr_str_t        admin_panel_path;        /**< Admin Panel path */
-  short           uds;          /**< UNIX domain socket flag(controlling flag) */
-};
 
 /** Read 'config.yml' file and fill configuration data structure */
-wr_conf_t* wr_conf_read(const char* root_path);
+int wr_conf_read();
 /** Destroy configuration data structure */
-void wr_conf_free(wr_conf_t*);
+void wr_conf_free();
 /** Display configuration data structure */
-void wr_conf_display(wr_conf_t*);
+void wr_conf_display();
 /** Add Admin Panel to configuration data structure */
-int wr_conf_admin_panel_add(wr_conf_t*);
+int wr_conf_admin_panel_add();
 /** Add the configuration for static content server */
-int wr_conf_static_server_add(wr_conf_t*);
+int wr_conf_static_server_add();
 #endif /*WR_CONFIGURATOR_H_*/

data/src/head/wr_connection.c

@@ -17,7 +17,8 @@
  * along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <wr_request.h>
-#include <wr_access_log.h>
+
+extern config_t *Config;
 
 // Connection count
 static unsigned int wr_conn_count = 0;
@@ -39,7 +40,8 @@ static wr_http_status_t http_status [] ={
   {413, "413 Request Entity Too Large", "The request entity is too large"},
   {414, "414 Request-URI Too Large", "The request URI is too large"},
   {500, "500 Internal Server Error", "The server encountered an unexpected condition which prevented it from fulfilling the request."},
-  {501, "501 Not Implemented", "The server does not support the functionality required to fulfill the request."}
+  {501, "501 Not Implemented", "The server does not support the functionality required to fulfill the request."},
+  {503, "503 Service Unavailable", "The server is currently unable to handle the request due to a temporary overloading or maintenance of the server."}
 };
 
 #define WR_RESP_BODY "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n\
@@ -92,7 +94,7 @@ void wr_conn_after_write_cb(ebb_connection *connection) {
                          wr_conn_after_write_cb);
   } else if(conn->resp_to_write <= 0) {
     LOG_DEBUG(DEBUG,"response to write is less than 1 keep alive =%d", conn->keep_alive);
-    if(!WR_SVR_KEEP_ALIVE || !conn->keep_alive) {
+    if(!(SERVER_KEEP_ALIVE & Config->Server.flag) || !conn->keep_alive) {
       // Close ebb_connection if there is no any pending request
       LOG_DEBUG(DEBUG,"Closing Connection %d ...", conn->id);
       ebb_connection_schedule_close(connection);
@@ -108,9 +110,6 @@ void wr_req_parse_err_cb(ebb_connection* connection) {
   LOG_DEBUG(DEBUG,"Connection id = %d",conn->id);
   conn->keep_alive = 0;
   wr_req_invalid(conn, WR_HTTP_STATUS_400);
-  //  if(conn->resp_to_write == 0)
-  //    conn->resp_to_write = 1;
-  //  wr_server_err_response(conn, WR_HTTP_STATUS_400);
 }
 
 /** The ebb connection goes timeout */
@@ -147,29 +146,25 @@ void wr_conn_close_cb(ebb_connection* connection) {
   }
 }
 
-/********************************************************
- *       Connection Function Definition      *
- ********************************************************/
-
 /** Create new Connection */
 wr_conn_t* wr_conn_new(wr_svr_t *server) {
   LOG_FUNCTION
   wr_conn_t* a_connection = wr_malloc(wr_conn_t);
-
+  
   if(a_connection == NULL) {
     LOG_DEBUG(SEVERE, "Error a_connection is null. Returning ...");
     return NULL;
   }
   ebb_connection *connection = wr_malloc(ebb_connection);
-
+  
   if(connection == NULL) {
     free(a_connection);
     LOG_DEBUG(SEVERE, "Error connection is null. Returning ...");
     return NULL;
   }
-
+  
   ebb_connection_init(connection);
-
+  
   a_connection->id = ++wr_conn_count;
   a_connection->resp_to_write = 0;
   a_connection->ebb_conn = connection;
@@ -184,10 +179,15 @@ wr_conn_t* wr_conn_new(wr_svr_t *server) {
   connection->on_close = wr_conn_close_cb;
   connection->on_timeout = wr_conn_timeout_cb;
   connection->on_request_parse_error = wr_req_parse_err_cb;
-
+  
   return a_connection;
 }
 
+
+/********************************************************
+ *       Connection Function Definition      *
+ ********************************************************/
+
 /** Destroy Connection */
 void wr_conn_free(wr_conn_t *conn) {
   LOG_FUNCTION
@@ -251,22 +251,22 @@ ebb_connection* wr_new_conn_cb(ebb_server* server, struct sockaddr_in* addr) {
 /** Response generated by Server */
 void wr_conn_err_resp(wr_conn_t *conn, wr_resp_status_t resp_code) {
   LOG_FUNCTION
-  char response_body[WR_LONG_LONG_STR_LEN];
-  char response_buff[WR_LONG_LONG_STR_LEN*2];
+  char response_body[STR_SIZE512];
+  char response_buff[STR_SIZE512*2];
   size_t body_len, buff_len;
 
   LOG_DEBUG(DEBUG, "response code = %s",http_status[resp_code].phrase);
   conn->keep_alive = 0;
   
-  char current_date[WR_STR_LEN];
-  get_time(current_date, WR_STR_LEN);
+  char current_date[STR_SIZE64];
+  get_time(current_date, STR_SIZE64);
 
   switch(resp_code) {
   case WR_HTTP_STATUS_100:
     body_len = 0;
     buff_len = sprintf(response_buff, WR_RESP_HEADERS,
-                       http_status[resp_code].phrase, current_date, WR_SERVER, 
-                       WR_VERSION, body_len, http_status[resp_code].message);
+                       http_status[resp_code].phrase, current_date, Config->Server.name.str, 
+                       Config->Server.version.str, body_len, http_status[resp_code].message);
     break;
   case WR_HTTP_STATUS_400:
   case WR_HTTP_STATUS_403:
@@ -277,21 +277,22 @@ void wr_conn_err_resp(wr_conn_t *conn, wr_resp_status_t resp_code) {
   case WR_HTTP_STATUS_414:
   case WR_HTTP_STATUS_500:
   case WR_HTTP_STATUS_501:
+  case WR_HTTP_STATUS_503:
     if(conn->req && conn->req->resp_buf_len > 0) {
       body_len = sprintf(response_body, WR_RESPONSE_ERR_BODY,
                          http_status[resp_code].phrase,http_status[resp_code].phrase+4,
                          http_status[resp_code].message,
                          conn->req->resp_buf,
-                         WR_SERVER, WR_VERSION);
+                         Config->Server.name.str, Config->Server.version.str);
     } else {
       body_len = sprintf(response_body, WR_RESP_BODY,
                          http_status[resp_code].phrase,http_status[resp_code].phrase+4,
-                         http_status[resp_code].message,WR_SERVER, WR_VERSION);
+                         http_status[resp_code].message,Config->Server.name.str, Config->Server.version.str);
     }
         
     buff_len = sprintf(response_buff, WR_RESP_HEADERS,
                        http_status[resp_code].phrase, current_date,
-                       WR_SERVER, WR_VERSION, body_len, response_body);
+                       Config->Server.name.str, Config->Server.version.str, body_len, response_body);
     break;
   }
 
@@ -299,7 +300,7 @@ void wr_conn_err_resp(wr_conn_t *conn, wr_resp_status_t resp_code) {
 
   if(conn->req) {
     wr_req_t* req = conn->req;
-    if(conn->svr->conf->server->flag&WR_SVR_ACCESS_LOG) {
+    if(Config->Server.flag & SERVER_ACCESS_LOG) {
       req->resp_body_len = body_len;
       req->resp_code = http_status[resp_code].code;
       wr_access_log(req);

data/src/head/wr_connection.h

@@ -35,8 +35,6 @@ typedef struct {
   wr_str_list_t  *resp;
 }wr_conn_t;
 
-/** Create new Connection */
-wr_conn_t* wr_conn_new(wr_svr_t*);
 /** Destroy Connection */
 void wr_conn_free(wr_conn_t*);
 /** Add response to Connection */
@@ -59,7 +57,8 @@ typedef enum {
   WR_HTTP_STATUS_413 ,
   WR_HTTP_STATUS_414 ,
   WR_HTTP_STATUS_500 ,
-  WR_HTTP_STATUS_501
+  WR_HTTP_STATUS_501 ,
+  WR_HTTP_STATUS_503
 }wr_resp_status_t;
 
 /** Response generated by Server */