v3.24

IMPROVEMENTS:

* Allowed adding spaces after section name in .ini file
 
BUG FIXES:

 * Was rename parameter `benchmark` to `statistics`

Author: VictorTrapenok

CHANGELOG.md

@@ -5,6 +5,16 @@ FEATURES:
 IMPROVEMENTS:
 BUG FIXES:
 
+## v3.24
+
+IMPROVEMENTS:
+
+* Allowed adding spaces after section name in .ini file
+ 
+BUG FIXES:
+
+ * Was rename parameter `benchmark` to `statistics`
+
 ## v3.23
 
 IMPROVEMENTS:

comet.ini

@@ -4,11 +4,11 @@
 ; docs for CppComet https://comet-server.com/wiki/doku.php
 ;
 
-[main] 
-  
+[main]
+
 ; Password for accessing comet server api
 password = 0000000000000000000000000000000000000000000000000000000000000000
- 
+
 [db]
 host = localhost
 user = root
@@ -17,7 +17,7 @@ name = comet_db
 port = 3306
 
 [ws]
-ip = 0.0.0.0 
+ip = 0.0.0.0
 thread_num = 4 ; number of threads for receive message from websockets
 statistics = 10 ;Interval between load measurements (0 = not measured)
 port = 8087 ; When connecting to js api, do not forget to specify the port in the node parameter
@@ -26,27 +26,18 @@ maxUptime = 0 ; The maximum value of uptime after which the connection is discon
 host = *  ; comma separated hosts from which allows receiving connections, or asterisk symbol for allowing connections from any host
 
 [cometql]
-ip = 0.0.0.0 
+ip = 0.0.0.0
 thread_num = 3 ; number of threads for receive message from cometql
 statistics = 10
 port = 3300
-uptimeTestInterval = 600  
-maxUptime = 0  
-  
+uptimeTestInterval = 600
+maxUptime = 0
+
 [statistics]
 allow = true  ; https://comet-server.com/wiki/doku.php/en:comet:ini-file#section_statistics
 
 
-[cluster]
-
-; Параметры кластера
-cometql = []host1.ru:3300@password
-cometql = []host2.ru:3300@password
-cometql = []host3.ru:3300@password
-cometql = []host4.ru:3300@password
-cometql = []host5.ru:3300@password
-
-[content-type] 
+[content-type]
 js = application/javascript
 
 [log]
@@ -68,5 +59,5 @@ ServerServer            = 500
 SimpleRedisClient       = 500
 tcpServer               = 500
 CometQLCluster          = 500
-devManager              = 500 
+devManager              = 500
 dbLink                  = 500

src/Client_connection.cpp

@@ -1220,9 +1220,9 @@ char* Client_connection::checking_event_name(thread_data* local_buf, const char*
  */
 int Client_connection::web_pipe_msg_v1(thread_data* local_buf, char* event_data,int client, int len)
 {
-    if(!appConf::instance()->get_bool('ws', 'support_old_api'))
+    if(!appConf::instance()->get_bool("ws", "support_old_api"))
     {
-        return;
+        return 0;
     }
 
     bool send_user_id = true;
@@ -1576,7 +1576,8 @@ int Client_connection::get_favicon_request(int client, int len, thread_data* loc
 }
 
 int Client_connection::get_custom_request(int client, int len, thread_data* local_buf)
-{
+{ 
+    TagLoger::log(Log_ClientServer, 0, ">Client GET get_custom_request\n"); 
     char *p = local_buf->buf.getData();
     int urlStart = strlen("GET ");
     p = p + urlStart;
@@ -1590,6 +1591,11 @@ int Client_connection::get_custom_request(int client, int len, thread_data* loca
 
     p[urlEnd - 1] = 0;
     char *uri = p; 
+    if(strncmp(uri, "/comet-server", strlen("/comet-server")) == 0)
+    {
+        uri += strlen("/comet-server");
+    }
+    
     std::string name(appConf::instance()->get_string("main", "base_dir"));
     if(name.empty())
     {

src/devManager.h

@@ -449,7 +449,7 @@ class devManager
         index = new devInfo(appConf::instance()->get_chars("main", "password") ); 
         intervalLoop::instance()->add([](int uptime, thread_data* local_buf)
         {
-            int benchmark = appConf::instance()->get_int("ws", "benchmark");
+            int benchmark = appConf::instance()->get_int("ws", "statistics");
             if( !benchmark || uptime% benchmark != 0)
             {
                 return;

src/ini_parser/ini_parser.hpp

@@ -149,7 +149,8 @@ class confVar{
         }
         else if(val.compare(0, 2, "[]"))
         {
-            list.push_back(val.erase(0, 2));
+            std::string arrStr = val;
+            list.push_back(arrStr.erase(0, 2));
         }
     } 
 
@@ -406,7 +407,7 @@ class ini_parser
             std::string key = extract_key(line);
             std::string value = extract_value(line);
 
-            //printf("assignment:%s[%s]=%s\n", current_section.data(), key.data(), value.data());
+            printf("assignment:%s[%s]=%s\n", current_section.data(), key.data(), value.data());
             set_value(current_section, key, value); 
         }
 
@@ -459,8 +460,8 @@ class ini_parser
          * bracket and the last character is a closing bracket.
          */
         bool is_section_start_line(const std::string& line) const
-        {
-            return (line.length() > 0) && (line[0] == '[') && (line[line.length() - 1] == ']');
+        { 
+            return (line.length() > 0) && (line[0] == '[') && (line[line.find_last_not_of(" \r\t")] == ']');
         }
 
         /*

src/main.cpp

@@ -86,10 +86,10 @@ void th_startServer(int threadid, const char* server_name)
 
 
 
-    if(appConf::instance()->get_int(server_name, "benchmark") > 0)
+    if(appConf::instance()->get_int(server_name, "statistics") > 0)
     {
         tcpServer <connectionType>::instance()->benchmark = 1;
-        tcpServer <connectionType>::instance()->bm.stat_interval = appConf::instance()->get_int(server_name, "benchmark");
+        tcpServer <connectionType>::instance()->bm.stat_interval = appConf::instance()->get_int(server_name, "statistics");
     }
     else
     {

src/main.h

@@ -102,8 +102,8 @@
     </body>\
     </html>" 
 
-#define MYSQL_SERVERNAME "CppComet 3.23"
-#define MYSQL_SYSTEMVARIBLE "CppComet 3.23 (comet-server.com, [email protected])"
+#define MYSQL_SERVERNAME "CppComet 3.24"
+#define MYSQL_SYSTEMVARIBLE "CppComet 3.24 (comet-server.com, [email protected])"
 
 #define maxValue( a, b ) ( (a) > (b) ? (a) : (b) )
 #define minValue( a, b ) ( (a) < (b) ? (a) : (b) )

src/tcpServer_benchmark.h

@@ -111,49 +111,7 @@ class tcpServer_benchmark: public intervalLoopObject
         }
         printf("---------------------------------------------\n");
     }
-    
-    void filePrint()
-    {
-        if(fp == NULL)
-        {
-            int len = strlen(name);
-            memcpy(file_name, name, len);
-            memcpy(file_name+len, ".csv", 4);
-            
-            fp = fopen(file_name, "w");
-            fprintf(fp, "work_time,conections,addClient,deleteClient,handle_message,ps_addClient,ps_deleteClient,ps_handle_message,loadavg_1,loadavg_2,loadavg_3,running_processes,total_processes" );
-            for(int i = 0; i< th_num; i++)
-            {
-                fprintf(fp, ",th_status_count%d,th_ps_status_count%d", i, i);
-            }
-            fprintf(fp, "\n");
-        }
-        
-        FILE* loadavgFp = fopen("/proc/loadavg", "r");
-        float loadavg_1, loadavg_2, loadavg_3;
-        int running_processes, total_processes;
-        
-        fscanf(loadavgFp, "%5f %5f %5f %5d/%5d", &loadavg_1, &loadavg_2, &loadavg_3, &running_processes, &total_processes);
-        fclose(loadavgFp);
-        
-        fprintf(fp, "%d,%d,%d,%d,%d,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%d,%d",
-                cprint_count, conections, addClient, deleteClient, handle_message, ps_addClient, ps_deleteClient, ps_handle_message, loadavg_1, loadavg_2, loadavg_3, running_processes, total_processes);
-         
-        for(int i = 0; i< th_num; i++)
-        {
-            fprintf(fp, ",%d,%.2f",th_status_count[i], th_ps_status_count[i]);
-        }
-        fprintf(fp, "\n");
-        fileCountLines++;
-        
-        if(fileCountLines > appConf::instance()->get_int("benchmark", "file_save")) 
-        {
-            fileCountLines = 0;
-            fclose(fp);
-            fp = fopen(file_name, "a");
-        }
-    }
-    
+     
     int getAddClient(){ return addClient; }
     float getPsAddClient(){ return ps_addClient; }
 
@@ -335,8 +293,7 @@ class tcpServer_benchmark: public intervalLoopObject
 
         cprint_count+=stat_interval;
 
-        if(appConf::instance()->get_bool("benchmark", "to_log")) cprint();  
-        if(appConf::instance()->get_bool("benchmark", "to_file")) filePrint();   
+        if(appConf::instance()->get_bool("statistics", "to_log")) cprint();   
     } 
 };