Merge pull request #30 from CppComet/alfa

fix restart problem
CppComet · Nov 2, 2017 · 73d45de · 73d45de
2 parents 96b7284 + 0efcb09
commit 73d45de
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/comet.ini b/comet.ini
@@ -69,6 +69,10 @@ interval = 3600
 [content-type]
 js = application/javascript
 
+[sip]
+pipesalt = fFg34F3nf4n3fGF
+
+
 [log]
 level = 500; Logging level (600 output all, 200 errors only)
 

diff --git a/src/MySql_connection.cpp b/src/MySql_connection.cpp
@@ -2359,6 +2359,7 @@ int MySql_connection::sql_insert_into_conference(thread_data* local_buf, unsigne
         "message",      // сообщение
         "mode"          // Режим  video_*, audio_*
     };
+    // Поле tabUUID передается или отслеживается через текст сообщения `message`
 
     if(!local_buf->sql.prepare_columns_for_insert(columDef, local_buf->qInfo))
     {

diff --git a/src/main.cpp b/src/main.cpp
@@ -276,6 +276,11 @@ void command_line_fork()
 
         if( strncmp(buf,"exit", strlen("exit") ) == 0 )
         {
+            if(tcpServer <MySql_connection>::instance()->bm.get_uptime() < 60)
+            {
+                printf("\x1b[31mExit command ignore\x1b[0m\n");
+                continue;
+            }
             printf("\x1b[31mExit command received\x1b[0m\n");
             //kill(getppid(), SIGTERM);
             close(fd);
@@ -285,7 +290,12 @@ void command_line_fork()
         }
         else if( strncmp(buf,"restart", strlen("restart") ) == 0 )
         {
-            printf("\x1b[31mExit command received\x1b[0m\n");
+            if(tcpServer <MySql_connection>::instance()->bm.get_uptime() < 60)
+            {
+                printf("\x1b[31mRestart command ignore\x1b[0m\n");
+                continue;
+            }
+            printf("\x1b[31mRestart command received\x1b[0m\n");
             //kill(pid, SIGTERM);
             close(fd);
             remove(NAMEDPIPE_NAME);