Merge remote-tracking branch 'github-origin/master'

This commit is contained in:
Andrea Cavalli 2020-11-23 17:29:13 +01:00
commit 9212b8c4ee
2 changed files with 5 additions and 4 deletions

View File

@ -76,5 +76,5 @@ target_link_libraries(telegram-bot-api PRIVATE memprof tdactor tdcore tddb tdnet
install(TARGETS telegram-bot-api RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") install(TARGETS telegram-bot-api RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
if (MSVC AND VCPKG_TOOLCHAIN) if (MSVC AND VCPKG_TOOLCHAIN)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/" DESTINATION "${CMAKE_INSTALL_BINDIR}" FILES_MATCHING PATTERN "*.dll") install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/" DESTINATION "${CMAKE_INSTALL_BINDIR}" FILES_MATCHING PATTERN "*.dll" PATTERN "*.pdb")
endif() endif()

View File

@ -45,9 +45,10 @@ class HttpServer : public td::TcpListener::Callback {
return; return;
} }
flood_control_.add_event(static_cast<td::int32>(now)); flood_control_.add_event(static_cast<td::int32>(now));
LOG(INFO) << "Create tcp listener " << td::tag("port", port_); LOG(INFO) << "Create tcp listener " << td::tag("address", ip_address_) << td::tag("port", port_);
listener_ = td::create_actor<td::TcpListener>(PSLICE() << "TcpListener" << td::tag("port", port_), port_, listener_ = td::create_actor<td::TcpListener>(
actor_shared(this, 1), ip_address_); PSLICE() << "TcpListener" << td::tag("address", ip_address_) << td::tag("port", port_), port_,
actor_shared(this, 1), ip_address_);
} }
void hangup_shared() override { void hangup_shared() override {