collarbone-annihilation/iu9-ca-web-chat
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

master #6

Closed
karimov-adel wants to merge 39 commits from master into adel_branch_2.0
pull from: master
merge into: collarbone-annihilation:adel_branch_2.0
Conversation 0 Commits 39 Files Changed 97 +12 -1
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7de352ce1c - Show all commits

11
building/main.cpp
View File

@ -150,7 +150,18 @@ struct CAWebChat {
"backend_logic/server_data_interact.cpp", "backend_logic/server_data_interact.cpp",
"backend_logic/client_server_interact.cpp", "backend_logic/client_server_interact.cpp",
"backend_logic/when_login.cpp",
"backend_logic/when_list_rooms.cpp",
"backend_logic/when_chat.cpp",
"backend_logic/when_user.cpp",
"backend_logic/polling.cpp", "backend_logic/polling.cpp",
"backend_logic/api_sendmessage.cpp",
"backend_logic/api_deletemessage.cpp",
"backend_logic/api_addmembertochat.cpp",
"backend_logic/api_removememberfromchat.cpp",
"backend_logic/api_createchat.cpp",
"backend_logic/api_leavechat.cpp",
"backend_logic/admin_control_procedure.cpp",
}; };
for (std::string& u: T.units) for (std::string& u: T.units)
u = "web_chat/iu9_ca_web_chat_lib/" + u; u = "web_chat/iu9_ca_web_chat_lib/" + u;

2
src/http_server/engine_engine_number_9/running_mainloop.cpp
View File

@ -260,8 +260,8 @@ namespace een9 {
ret = poll(pollfds.data(), Nip, params.mainloop_recheck_interval_us); ret = poll(pollfds.data(), Nip, params.mainloop_recheck_interval_us);
if (ret != 0 && errno != 0) { if (ret != 0 && errno != 0) {
printf("poll() error :> %s\n", een9::prettyprint_errno("").c_str()); printf("poll() error :> %s\n", een9::prettyprint_errno("").c_str());
continue;
} }
ASSERT_on_iret(ret, "poll()");
for (size_t i = 0; i < Nip; i++) { for (size_t i = 0; i < Nip; i++) {
if ((pollfds[i].revents & POLLRDNORM)) { if ((pollfds[i].revents & POLLRDNORM)) {
try { try {