Merge pull request #26 from CppComet/alfa

3.26

Author: VictorTrapenok

.gitignore

@@ -0,0 +1 @@
+/CMakeFiles/

CHANGELOG.md

@@ -5,6 +5,27 @@ FEATURES:
 IMPROVEMENTS:
 BUG FIXES:
 
+## v3.26
+
+BUG FIXES:
+
+ * bug fix to query `select * from pipes where name in ("web_test");`
+ * Command systemctl stop comet.service does not work on Ubuntu 16 ( #17 )
+
+IMPROVEMENTS:
+
+* Added parameter `send_user_online_events` to `main`
+* Added parameter `send_user_offline_events` to `main`
+* Added parameter `save_users_last_online_time` to `main`
+
+* Added section `cluster`
+* Added section `cometqlproxy`
+* Added clustering mechanism #15
+* Added pidfile option in section `main`.`pidfile`
+
+* Added queryes like `set paramName paramValue`
+* Added queryes like `set sectionName paramName paramValue`
+
 ## v3.25
 
 IMPROVEMENTS:
@@ -68,4 +89,4 @@ FEATURES:
  * Added server version to ws answer
  * Js Api version 3.26
  * Removed message `setState` from console log in Js Api
- * Fixed bug when Js api in offline
+ * Fixed bug when Js api in offline

comet-service.sh

@@ -10,64 +10,35 @@
 ### END INIT INFO
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-RUNDIR=/root/comet/
-CONFIG=/root/comet/comet.conf  
+RUNDIR=/etc/comet-server/
 EXTRAOPTS=
-PIDFILE=
-
+PIDFILE=/var/run/cppcomet.pid
 
 echo "CppComet"
- 
+
 cd ${RUNDIR}
- 
+
 case "$1" in
-    start)    
-        startCount=`ps auxH | grep "comet-start.sh" | wc -l`
-        if [ $startCount -ne 2 ]
+    start) 
+        if [test -f "$PIDFILE"]
         then
-            count=`ps auxH | grep "cpp_comet" | wc -l`
-            if [ $count -le 40  ]
-            then
-                echo "Starting CppComet"
-                nohup ./comet-start.sh > cpp_comet.log &
-            else
-                echo "CppComet already run"
-            fi
-        else
             echo "CppComet already run"
+        else
+            echo "Starting CppComet"
+            nohup ./comet-start.sh > /var/log/cpp_comet.log &
         fi
         ;;
     stop)
         echo "Stopping CppComet"
-        ps aux | grep -E "comet-start.sh" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        ps auxH | grep "comet-start.sh" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        
-        
-        ps aux | grep -E "cpp_comet" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        ps auxH | grep "cpp_comet" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-         
+        kill `cat $PIDFILE`
+        `rm -rf $PIDFILE`
         ;;
     *)
         echo "Stopping CppComet"
-        ps aux | grep -E "comet-start.sh" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        ps auxH | grep "comet-start.sh" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        
-        ps aux | grep -E "cpp_comet" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-        ps auxH | grep "cpp_comet" | grep -o -E "root +([0-9]+)" | grep -o -E "[0-9]+" | xargs kill 
-         
-        startCount=`ps auxH | grep "comet-start.sh" | wc -l`
-        if [ $startCount -ne 2 ]
-        then
-            count=`ps auxH | grep "cpp_comet" | wc -l`
-            if [ $count -le 40  ]
-            then
-                echo "Starting CppComet"
-                nohup ./comet-start.sh > cpp_comet.log &
-            else
-                echo "CppComet already run"
-            fi
-        else
-            echo "CppComet already run"
-        fi
-        ;; 
+        kill `cat $PIDFILE`
+        `rm -rf $PIDFILE`
+
+        echo "Starting CppComet"
+        nohup ./cpp_comet > /var/log/cpp_comet.log &
+        ;;
 esac

comet-start.sh

@@ -9,6 +9,16 @@
 ; Password for accessing comet server api
 password = 0000000000000000000000000000000000000000000000000000000000000000
 
+send_user_online_events = true 
+send_user_offline_events = true
+
+; Whether it is necessary to save in a bd time when the user was last time online or it is not necessary
+; If you do not save that load for a bd less
+save_users_last_online_time = true
+
+
+pidfile = /var/run/cppcomet.pid ; address for pid file (do not change if necessary)
+
 [db]
 host = localhost
 user = root
@@ -25,6 +35,10 @@ uptimeTestInterval = 600 ; The interval for checking the uptime of the connectio
 maxUptime = 0 ; The maximum value of uptime after which the connection is disconnected.
 host = *  ; comma separated hosts from which allows receiving connections, or asterisk symbol for allowing connections from any host
 
+; The parameters of the cluster (without spaces or anything else between the parameters, are case sensitive)
+;cluster = []Server=127.0.0.1,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3311 
+;cluster = []Server=127.0.0.1,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3321
+
 [cometql]
 ip = 0.0.0.0
 thread_num = 3 ; number of threads for receive message from cometql
@@ -37,20 +51,26 @@ maxUptime = 0
 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
-
+[cometqlproxy]
+; Clustering Functions
+;
+ip = 0.0.0.0
+thread_num = 3 ; number of threads for receive message from cometql
+statistics = 10
+port = 3301
+uptimeTestInterval = 600
+maxUptime = 0
+ 
+; The parameters of the cluster (without spaces or anything else between the parameters, are case sensitive)
+;cluster = []Server=127.0.0.1,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3301 
+;cluster = []Server=127.0.0.1,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3311
+;cluster = []Server=127.0.0.1,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3321
+ 
 [content-type]
 js = application/javascript
 
 [log]
-level = 200; Logging level (600 output all, 200 errors only)
+level = 500; Logging level (600 output all, 200 errors only)
 
 ; Logging levels for individual subsystems
 ; Change only if debugging is necessary

comet.ini

@@ -92,6 +92,7 @@ execute_process( COMMAND bison -d --verbose --debug ../src/CometQL.y -o ../src/C
 execute_process( COMMAND yacc -d --verbose --debug ../src/CometQL.y -o ../src/CometQL.cc)
 execute_process( COMMAND cc -c ../src/lex.yy.c -o ../src/lex.yy.o)
 
+add_definitions(-DUSE_COVERAGE=1) 
 
 # Установка переменной со списком исходников для исполняемого файла
 set(SOURCE_EXE 
@@ -133,4 +134,3 @@ target_link_libraries (cpp_comet_coverage ${CMAKE_THREAD_LIBS_INIT}  ${MYSQL_LIB
 
 #cmake ./ && make
 
-

coverage/CMakeLists.txt

@@ -0,0 +1,92 @@
+; CppComet https://github.com/CppComet/comet-server
+;
+; docs for this file ./docs/comet.ini.md
+; docs for CppComet https://comet-server.com/wiki/doku.php
+;
+
+[main]
+
+; Password for accessing comet server api
+password = 0000000000000000000000000000000000000000000000000000000000000000
+
+send_user_online_events = true 
+send_user_offline_events = true
+
+; надо ли сохранять в бд время когда пользователь был последний раз онлайн или не надо
+; Если не сохранять то нагрузка на бд меньше
+save_users_last_online_time = true
+
+pidfile = /var/run/cppcomet.pid ; адрес для pid файла (не менять без нужды)
+
+[db]
+host = test.comet.su
+user = root
+password = OeN1UYBrpvZo
+name = comet_db
+port = 3305 
+
+[ws]
+ip = 0.0.0.0
+thread_num = 1 ; 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
+uptimeTestInterval = 60 ; The interval for checking the uptime of the connections (it also corrects the value of the online user count for one)
+maxUptime = 59 ; The maximum value of uptime after which the connection is disconnected.
+host = *  ; comma separated hosts from which allows receiving connections, or asterisk symbol for allowing connections from any host
+
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3310
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3320
+
+[cometql]
+ip = 0.0.0.0
+thread_num = 1 ; number of threads for receive message from cometql
+statistics = 10
+port = 3300
+uptimeTestInterval = 60
+maxUptime = 59
+
+[statistics]
+allow = true  ; https://comet-server.com/wiki/doku.php/en:comet:ini-file#section_statistics
+to_log = true
+
+[cometqlproxy]
+; Функции кластеризации
+;
+ip = 0.0.0.0
+thread_num = 1 ; number of threads for receive message from cometql
+statistics = 10
+port = 3301
+uptimeTestInterval = 60
+maxUptime = 59
+ 
+; Параметры кластера (без пробелов и прочего между параметрами, регистрозависимо)
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3300
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3300
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3300
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3310
+cluster = []Server=test.comet.su,Database=CometQL_v1,Uid=root,Pwd=0000000000000000000000000000000000000000000000000000000000000000,Port=3320
+
+[content-type]
+js = application/javascript
+
+[log]
+level = 500; Logging level (600 output all, 200 errors only)
+
+; Logging levels for individual subsystems
+; Change only if debugging is necessary
+Any                     = 500
+TagLoger                = 500
+appConf                 = 500
+pipeCommands            = 500
+statistics              = 500
+removeOldConnections    = 500
+MySqlServer             = 500
+UserIndex               = 500
+UserItem                = 500
+ClientServer            = 500
+ServerServer            = 500
+SimpleRedisClient       = 500
+tcpServer               = 500
+CometQLCluster          = 500
+devManager              = 500
+dbLink                  = 500

coverage/cometN1.ini

@@ -1,14 +1,13 @@
 #!/bin/bash
 
-
+rm -rf cov
 mkdir cov
 cd cov
 
 # Определение coverage
 # find ./ -type f -iname '*.gcno' | grep "main" | sed -e 's/main.cpp/*/g'
 files=`find ../ -type f -iname '*.gcno' | grep "main" | sed -e 's/main.cpp/*/g'`
 
-print "nnn - $files"
 
 lcov --directory .. --capture --output-file cov.tmp1
 gcov -b $files
@@ -19,11 +18,9 @@ gcov -b $files
 mkdir cov
 
 nstart1=`cat cov.tmp1 | grep -n "\.cc" | grep -E -o "^[0-9]+"`
-print "nnn - $nstart1"
 cat cov.tmp1 | sed -e "$nstart1,/end_of_record/d" >  cov.tmp2
 
 nstart2=`cat cov.tmp2 | grep -n "\.y" | grep -E -o "^[0-9]+"` 
-print "nnn - $nstart2"
 cat cov.tmp2 | sed -e "$nstart2,/end_of_record/d" >  cov.info
 
 genhtml -o ./cov cov.info
@@ -32,4 +29,3 @@ genhtml -o ./cov cov.info
 
 
 
-

coverage/coverage.sh

@@ -1,4 +1,15 @@
 
 ## Calculate coverage
 
-Scripts for calculate coverage in tests
+Scripts for calculate coverage in tests
+
+
+```apt-get install lcov```
+
+
+```sh ./run.sh```
+
+
+```sh ./coverage.sh```
+
+

coverage/readme.md

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+ # Запуск с coverage
+cmake .
+make
+
+# Запуск под valgrind
+./cpp_comet_coverage --conf ./cometN1.ini
+