ruby-lsapi 5.0 → 5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a6919e0d321057af7cf14393996e0363f79078d81f7246bc763c6111f9b4fa
-  data.tar.gz: fb8fbce714f668d4b974bccce18f48b384a491011d4e2172f3c8635e00f10cbf
+  metadata.gz: 665d989d50ec0e54915439997a1a09c0eb77c6bfdc0e1bf86dc96096b8eaab4a
+  data.tar.gz: 0fc93aa398f8f0bf7ef5b566cbd0504f509d6b3f80eb6a1532f719ab1b296f51
 SHA512:
-  metadata.gz: 673a3a93b519d8d54171ff6430970669c8ad23fa023ff8f1a3f774b446b54f171a8027a89c2f6c4acd5d0a7c00f394d225d8d58736accb5b528f731a50b285be
-  data.tar.gz: bc5907c83c66ed42af04b60ef5977dc01603e2c210fb5d36b8904303193a6ae537213ae9a1c92ada2a9f89efb873bf470525ae2357edf215d8f2db308b1d80cb
+  metadata.gz: 4ad0661c05da99577c6a8a0974a49e5621c250b498122b6b8acb045dc1076a1e8413f65af66c3b3c78c169b28ab2180ff72db08339c8f8311059c8086223bfbd
+  data.tar.gz: facafedc4aa6c30e1f7007188d743b1a47c919eef452a17119065e0ce47bee4be551fc017521de61cf9685c901494e042a254216c663ca88ff088bdff206d636

data/ext/lsapi/lsapilib.c

@@ -225,8 +225,8 @@ void LSAPI_Log(int flag, const char * fmt, ...)
 {
     char buf[1024];
     char *p = buf;
-    if ((flag & LSAPI_LOG_TIMESTAMP_BITS) &&
-        !((flag & LSAPI_LOG_TIMESTAMP_STDERR) && s_stderr_is_pipe))
+    if ((flag & LSAPI_LOG_TIMESTAMP_BITS)
+        && !(s_stderr_is_pipe))
     {
         struct timeval  tv;
         struct tm       tm; 
@@ -253,7 +253,7 @@ void LSAPI_Log(int flag, const char * fmt, ...)
     
     if (flag & LSAPI_LOG_PID)
     {
-        p += snprintf(p, 100, "[%d] ", s_pid);
+        p += snprintf(p, 100, "[UID:%d][%d] ", getuid(), s_pid);
     }
         
     if (p > buf)
@@ -275,10 +275,16 @@ void LSAPI_Log(int flag, const char * fmt, ...)
 
 #endif
 
-#define lsapi_log(...)  LSAPI_Log(LSAPI_LOG_TIMESTAMP_FULL|LSAPI_LOG_TIMESTAMP_STDERR|LSAPI_LOG_PID, __VA_ARGS__)
+#define lsapi_log(...)  LSAPI_Log(LSAPI_LOG_TIMESTAMP_FULL|LSAPI_LOG_PID, __VA_ARGS__)
 
 
-static int lsapi_parent_dead() 
+void lsapi_perror(const char * pMessage, int err_no)
+{
+    lsapi_log("%s, errno: %d (%s)\n", pMessage, err_no, strerror(err_no));
+}
+
+
+static int lsapi_parent_dead()
 {
     // Return non-zero if the parent is dead.  0 if still alive.
     if (!s_ppid) {
@@ -874,7 +880,8 @@ int LSAPI_is_suEXEC_Daemon(void)
 static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char *pErr2 )
 {
     char achError[4096];
-    int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), 
+    int n = snprintf(achError, sizeof(achError), "[UID:%d][%d] %s:%s: %s\n",
+                     getuid(), getpid(),
                      pErr1, (pErr2)?pErr2:"", strerror(errno));
     if (n > (int)sizeof(achError))
         n = sizeof(achError);
@@ -2605,7 +2612,8 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
     while( isspace( *pBind ) )
         ++pBind;
 
-    strncpy( achAddr, pBind, 256 );
+    strncpy(achAddr, pBind, 255);
+    achAddr[255] = 0;
 
     switch( *p )
     {
@@ -2953,9 +2961,9 @@ static void dump_debug_info( lsapi_child_status * pStatus, long tmCur )
             return;
     }
 
-    lsapi_log("Possible runaway process, PPID: %d, PID: %d, "
+    lsapi_log("Possible runaway process, UID: %d, PPID: %d, PID: %d, "
              "reqCount: %d, process time: %ld, checkpoint time: %ld, start "
-             "time: %ld\n", getpid(), pStatus->m_pid,
+             "time: %ld\n", getuid(), getppid(), pStatus->m_pid,
              pStatus->m_iReqCounter, tmCur - pStatus->m_tmReqBegin, 
              tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart );
 
@@ -2983,7 +2991,7 @@ static void lsapi_check_child_status( long tmCur )
     while( pStatus < pEnd )
     {
         tobekilled = 0;
-        if ( pStatus->m_pid != 0 )
+        if ( pStatus->m_pid != 0 && pStatus->m_pid != -1)
         {
             ++count;
             if ( !pStatus->m_inProcess )
@@ -3177,8 +3185,6 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
             if (pServer->m_iCurChildren > 0
                 && accepting > 0)
             {
-                lsapi_log("children: %d, accepting: %d\n",
-                          pServer->m_iCurChildren, accepting);
                 usleep( 400);
                 while(accepting-- > 0)
                     sched_yield();
@@ -3270,7 +3276,9 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
             }
             else if ( pid == -1 )
             {
-                perror( "fork() failed, please increase process limit" );
+                lsapi_perror("fork() failed, please increase process limit", errno);
+                if (child_status)
+                    child_status->m_pid = 0;
             }
             else
             {
@@ -3293,7 +3301,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
         {
             if (( errno == EINTR )||( errno == EAGAIN))
                 continue;
-            perror( "accept() failed" );
+            lsapi_perror("accept() failed", errno);
             return -1;
         }
     }
@@ -3450,8 +3458,6 @@ int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq)
             if (pServer->m_iCurChildren > 0
                 && accepting > 0)
             {
-                lsapi_log("children: %d, accepting: %d\n",
-                          pServer->m_iCurChildren, accepting);
                 usleep( 400);
                 while(accepting-- > 0)
                     sched_yield();
@@ -3495,7 +3501,7 @@ int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq)
         {
             if ((errno == EINTR) || (errno == EAGAIN))
                 continue;
-            perror( "accept() failed" );
+            lsapi_perror("accept() failed", errno);
             ret = -1;
             break;
         }
@@ -3511,13 +3517,6 @@ int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq)
 }
 
 
-void lsapi_perror( const char * pMessage, int err_no )
-{
-    lsapi_log("%s, errno: %d (%s)\n", pMessage, err_no,
-              strerror( err_no ) );
-}
-
-
 int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
 {
     int             fd;

data/ext/lsapi/lsruby.c

@@ -808,6 +808,7 @@ void Init_lsapi()
 {
     VALUE orig_verbose; 
     char * p;
+    int prefork = 0;
     LSAPI_Init();
     initBodyBuf();
     
@@ -822,15 +823,18 @@ void Init_lsapi()
     
     s_pid = getpid();
     
-    p = getenv( "RAILS_ROOT" );
+    p = getenv( "RACK_ROOT" );
     if ( p )
     {
         if ( chdir( p ) == -1 )
             perror( "chdir()" );
     }
-    if ( p || getenv( "RAILS_ENV" ) )
+    if ( p || getenv( "RACK_ENV" ) )
         s_fn_add_env = add_env_rails;
     
+    p = getenv("LSAPI_CHILDREN");
+    if (p && atoi(p) > 1)
+        prefork = 1;
     
     orig_stdin = rb_stdin;
     orig_stdout = rb_stdout;
@@ -851,9 +855,12 @@ void Init_lsapi()
     
     cLSAPI = rb_define_class("LSAPI", rb_cObject);
     rb_define_singleton_method(cLSAPI, "accept", lsapi_s_accept, 0);
-    rb_define_singleton_method(cLSAPI, "accept_new_connection", lsapi_s_accept_new_conn, 0);
-    rb_define_singleton_method(cLSAPI, "postfork_child", lsapi_s_postfork_child, 0);
-    rb_define_singleton_method(cLSAPI, "postfork_parent", lsapi_s_postfork_parent, 0);
+    if (prefork)
+    {
+        rb_define_singleton_method(cLSAPI, "accept_new_connection", lsapi_s_accept_new_conn, 0);
+        rb_define_singleton_method(cLSAPI, "postfork_child", lsapi_s_postfork_child, 0);
+        rb_define_singleton_method(cLSAPI, "postfork_parent", lsapi_s_postfork_parent, 0);
+    }
 
     rb_define_method(cLSAPI, "process", lsapi_process, 0 );
     /* rb_define_method(cLSAPI, "initialize", lsapi_initialize, 0); */

data/lsapi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-lsapi}
-  s.version = "5.0"
-  s.date = %q{2020-05-15}
+  s.version = "5.1"
+  s.date = %q{2020-09-01}
   s.description = "This is a ruby extension for fast communication with LiteSpeed Web Server."
   s.summary = %q{A ruby extension for fast communication with LiteSpeed Web Server.}
   s.has_rdoc = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsapi
 version: !ruby/object:Gem::Version
-  version: '5.0'
+  version: '5.1'
 platform: ruby
 authors:
 - LiteSpeed Technologies Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby extension for fast communication with LiteSpeed Web Server.
 email: info@litespeedtech.com