v 3.29

Author: VictorTrapenok

CHANGELOG.md

@@ -5,6 +5,18 @@ FEATURES:
 IMPROVEMENTS:
 BUG FIXES:
 
+## v3.29
+
+BUG FIXES:
+
+ * fix bug in star scripts
+
+IMPROVEMENTS:
+
+ * add parametr connection_attempts to section db
+ * rebild docs in .md files and impruve links in docs
+ 
+
 ## v3.28
 
 BUG FIXES:

docs/Administration/Install.md

@@ -50,6 +50,18 @@ password = 0000000000000000000000000000000000000000000000000000000000000000
 ```
 
 
+# Add to Startup
+ 
+
+```
+cp ./comet.service /etc/systemd/system
+systemctl daemon-reload
+systemctl enable comet.service
+```
+
+
+After successes run server we can begin create chat. If you get error create issue in [github repository](https://github.com/Levhav/comet-server/issues).
+
 # Launch
 Run in console mode
 
@@ -68,18 +80,6 @@ systemctl start comet.service
 ```
 
 
-# Add to Startup
- 
-
-```
-cp ./comet.service /etc/systemd/system
-systemctl daemon-reload
-systemctl enable comet.service
-```
-
-
-After successes run server we can begin create chat. If you get error create issue in [github repository](https://github.com/Levhav/comet-server/issues).
-
 # Configuring nginx as a reverse proxy
 
 In order to configure the operation of comets on one machine with a web server, or just have the ability to work not only on http but also on https, you need to configure the reverse proxy.
@@ -198,3 +198,48 @@ $link = mysqli_connect("example.ru", "root", "", "CometQL_v1", 3300);
 ```
 
 
+# Unreadable file comet.ini
+
+Some text editors add unprintable simbols to the utf8 file. After that, the file may look the same but the comet server will not parse it correctly. You can try using another editor or delete the old file and create a new one with the same text.
+
+# Error while assembling in CentOS
+
+
+```
+
+CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
+Please set them or make sure they are set and tested correctly in the CMake files:
+MYSQL_INCLUDE_DIR (ADVANCED)
+
+```
+
+
+Can not find the client's mysql header files. You can try installing the mysql-devel package
+
+
+```
+
+yum install mysql-devel
+
+```
+
+
+# Error while assembling in CentOS
+
+
+```
+
+/etc/comet-server/comet-server/src/mystring.cpp:15:51: fatal error: uuid / uuid.h: No such file or directory exists
+ #include <uuid/uuid.h>
+
+```
+
+
+Can not find the file uuid.h. You can try installing the libuuid libuuid-devel package
+
+
+```
+
+yum install libuuid libuuid-devel
+
+```

docs/Examples/PHP chat example.md

@@ -101,8 +101,8 @@ subscription Code to the pipe on comet server. This callback will be called when
 
 # Links
 
-  * [JavaScript API](/docs/API/JavaScript%20API/JavaScript%20API.md)
-  * [CometQL API](/docs/API/CometQL/CometQL%20API.md)
+  * [JavaScript API](/docs/API/JavaScript%20API/JavaScript%20API)
+  * [CometQL API](/docs/API/CometQL/CometQL%20API)
   * [Online demo](https://jsfiddle.net/o35kvmn2/5/)
   * [CppComet](https://github.com/CppComet/comet-server)
   * [Creating a simple chat using CppComet](https://www.codeproject.com/script/Articles/ArticleVersion.aspx?waid=235463&aid=1181698)

docs/Introduction/Introduction.md

@@ -39,8 +39,8 @@ Push notifications can be implemented by PHP, but PHP need to use more memory co
 # Links
 We recommend you to read these articles:
 
-  * [PHP chat example](/docs/Examples/PHP%20chat%20example.md)  
-  * [JavaScript API](/docs/API/JavaScript%20API/JavaScript%20API.md)
-  * [CometQL API](/docs/API/CometQL/CometQL%20API.md) 
+  * [PHP chat example](/docs/Examples/PHP%20chat%20example)  
+  * [JavaScript API](/docs/API/JavaScript%20API/JavaScript%20API)
+  * [CometQL API](/docs/API/CometQL/CometQL%20API) 
   * [CppComet](https://github.com/CppComet/comet-server) 
-  * [An example of sending a message from a bash script](/docs/Examples/An%20example%20of%20sending%20a%20message%20from%20a%20bash%20script.md)
+  * [An example of sending a message from a bash script](/docs/Examples/An%20example%20of%20sending%20a%20message%20from%20a%20bash%20script)

docs/README.md

@@ -2,7 +2,7 @@
 # CppComet Documentation
 
  * [Russian](http://comet-server.org/doku.php/ru) language
- * [English](http://comet-server.org/doku.php/en) language
+ * English language on [project site](http://comet-server.org/doku.php/en) or in [readthedocs](http://cppcomet.readthedocs.io/en/latest/)
 
 # CppComet community
 
@@ -11,4 +11,50 @@
 
 # CppComet roadmap
 
- * [Roadmap](https://github.com/CppComet/comet-server/projects/1)
+ * [Roadmap](https://github.com/CppComet/comet-server/projects/1)
+
+# CppComet github
+
+ * [Github](https://github.com/CppComet/comet-server)
+
+
+
+# Star.Comet - Documentation
+
+  * If you want to understand why you need a server that comets read [Introduction](/docs/Introduction/Introduction)
+  * Start API study recommended with aticle [CometQL](/docs/comet/CometQL) and [JavaScript API](/docs/API/JavaScript%20API/JavaScript%20API)
+
+# Articles 
+
+  * [Introduction](/docs/Introduction/Introduction) - the description of comet-technology, abilities, sphere of usage and how really work push-notifications.
+  * [CometQL documentation](/docs/comet/CometQL) - a server API for work with the comet-server
+  * [JavaScript API documentation](/docs/API/JavaScript%20API/JavaScript%20API)  - a client API for work with the comet-server
+  * [Star.Comet-Chat](/docs/comet/star-comet-chat) - a chat plugin for private correspondence between two users.  
+  * [Reserved channel names](/docs/API/Reserved%20channel%20names) - description of channels with special properties
+  * [An example of sending a message from a bash script](/docs/Examples/An%20example%20of%20sending%20a%20message%20from%20a%20bash%20script)
+  * [Error codes in CometQL](/docs/API/Error%20codes%20in%20CometQL) - Error codes that are available when working with CometQL API
+  * [Public identifier Developer](/docs/API/Connection%20settings) - What is a "Public ID Developer" and "Secret developer key"
+  * [Users authorization](/docs/API/Authorization%20on%20the%20CppComet) - Description of the mechanism on the user authorization server on comets
+  * [Creating a simple php chat](https://www.codeproject.com/Articles/1181698/Creating-a-simple-chat-using-CppComet)
+  * [php chat example](https://github.com/CppComet/php-chat-example)
+  * [Fast PHP Comet chat system tutorial](https://www.phpclasses.org/blog/post/452-Fast-PHP-Comet-Chat-System-Tutorial.html)
+  * [Example for taking a message getting of the channel in JavaScript](/docs/Examples/How%20to%20take%20a%20message%20out%20of%20the%20channel%20in%20JavaScript)
+  * [Online CometQL command line](/docs/Examples/Online%20CometQL%20CLI)
+  
+# Administering comet servers
+
+  * [Install](/docs/Administration/Install) - Instructions for assembling and installing comets on your server
+  * [Checking the hosting](/docs/Troubleshooting/Checking%20the%20hosting%20for%20possible%20connect%20to%20the%20comet%20server) - Checking the hosting for possible connect to the comet server
+  * [load testing](/docs/load%20testing/Stress%20testing) - Example of load testing for comet server with tsung
+  * [load testing results](/docs/load%20testing/Report%20about%20testing%20of%2064000%20connections%20online) - Report about testing of 64,000 connections online
+
+
+# Plans for the development of the project
+
+About what improvements are planned, and which ones are already being implemented you can look at [this page](https://github.com/CppComet/comet-server/projects/1/). If there are any suggestions, questions, requests or requests for adding new features, you can [create issue](https://github.com/CppComet/comet-server/issues) or write to tech support after registration.
+
+
+___
+If you have a question that may be of interest to other users, it's better to ask about the problem on [github](https://github.com/CppComet/comet-server) ([creating issue](https://github.com/CppComet/comet-server/issues))
+___
+

docs/load testing/Report about testing of 64000 connections online.md

@@ -2,7 +2,7 @@
 # Report about testing of 64,000 connections online
 
 
-At previous article we examined the [ how to conduct the stress testing.](/docs/load%20testing/Stress%20testing.md) And here I want to show you how I conducted it by myself, and give its results.
+At previous article we examined the [ how to conduct the stress testing.](/docs/load%20testing/Stress%20testing) And here I want to show you how I conducted it by myself, and give its results.
 
 
 ___

install.sh

@@ -181,6 +181,12 @@ bool appConf::initFromFile(const char *fileName)
     /**
      *  mysql db 
      */
+    
+    if(!is_property_exists("db", "connection_attempts"))
+    {
+        sections["db"]["connection_attempts"] = "10"; 
+    } 
+    
     if(!is_property_exists("db", "host"))
     {
         // Ошибочка, параметр обязателен

src/appConf.cpp

@@ -406,7 +406,7 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    TagLoger::log(Log_Any, 0, "Server starting pid:%d, getrusage:%d\n", getpid());
+    TagLoger::log(Log_Any, 0, "Server starting pid:%d, getrusage:%d\n", (int)getpid());
     TagLoger::initTagLevels();
 
     dbLink mydb;
@@ -415,21 +415,56 @@ int main(int argc, char *argv[])
             appConf::instance()->get_chars("db", "password"),
             appConf::instance()->get_chars("db", "name"),
             appConf::instance()->get_int("db", "port"));
-    if(!mydb.connect())
+    
+    int connection_attempts = appConf::instance()->get_int("db", "connection_attempts");
+    if(!connection_attempts)
     {
-        TagLoger::error(Log_Any, 0, "\x1b[1;31mError: MySQL connection not established\x1b[0m");
+        connection_attempts = 1;
     }
+    
+    int count = 0;
+    bool isSuccess = false;
+    do{
+        count++;
+        if(!mydb.connect())
+        {
+            TagLoger::error(Log_Any, 0, "\x1b[1;31mError: MySQL connection not established (attempt=%d)\x1b[0m", count);
+            sleep(5);
+            continue;
+        }
 
-    if(!mydb.query_format("INSERT INTO `log_event`(`id`, `text`) VALUES (NULL,'start-%s');", appConf::instance()->get_chars("main", "node_name")))
+        if(!mydb.query_format("INSERT INTO `log_event`(`id`, `text`) VALUES (NULL,'start-%s');", appConf::instance()->get_string("main", "node_name").data()))
+        {
+            sleep(5);
+            continue;
+        }
+        else
+        {
+            isSuccess = true;
+            break;
+        }
+        
+    }while(count < connection_attempts);
+
+    if(!isSuccess)
     {
-        return 0;
+        TagLoger::error(Log_Any, 0, "\x1b[1;31mError: MySQL connection not established\x1b[0m");
+        return -1;
     }
-
+    
     // Запись pid в var run 
     auto fp = fopen(appConf::instance()->get_chars("main", "pidfile"), "w");
-    fprintf(fp, "%d", getpid());
-    fclose(fp);
-
+    if(fp == NULL)
+    {
+        TagLoger::error(Log_Any, 0, "\x1b[1;31mError: pidfile is not updated\x1b[0m");
+        perror("Error: pidfile is not updated");
+    }
+    else
+    {
+        fprintf(fp, "%d", (int)getpid());
+        fclose(fp);
+    }
+    
     while(true)
     {
         pid_t pid = fork(); 
@@ -444,15 +479,15 @@ int main(int argc, char *argv[])
         else if(pid == 0)
         {
             // Это процесс-потомок
-            TagLoger::debug(Log_appConf, 0, "PID=%d, PPID=%d", getpid(), getppid());
+            TagLoger::debug(Log_appConf, 0, "PID=%d, PPID=%d", (int)getpid(), (int)getppid());
             signal(SIGHUP,  posix_death_signal); //  сигнал, посылаемый процессу для уведомления о потере соединения с управляющим терминалом пользователя. ( может быть перехвачен или проигнорирован программой. )
 
             break;
         }
         else
         {
             // Это процесс-родитель 
-            TagLoger::debug(Log_appConf, 0, "PID=%d, Child PID=%d", getpid(), pid); 
+            TagLoger::debug(Log_appConf, 0, "PID=%d, Child PID=%d", (int)getpid(), pid); 
             signal(SIGHUP,  posix_log_signal); //  сигнал, посылаемый процессу для уведомления о потере соединения с управляющим терминалом пользователя. ( может быть перехвачен или проигнорирован программой. )
 
             int status;

src/main.cpp

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