fixes 1-3

Author: tkvitko

CMakeLists.txt

@@ -13,20 +13,33 @@ find_package(OpenSSL)
 
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
-    add_executable(cpp_search_qt_creator main.cpp Crowler.h Crowler.cpp root_certificates.hpp
+    add_executable(crowler
+        main.cpp
+        Crowler.h Crowler.cpp
+        root_certificates.hpp
         DbManager.h DbManager.cpp
         Searcher.h Searcher.cpp
         SafeQueue.h SafeQueue.cpp
         IniParser.h IniParser.cpp
         exceptions.h
-        config.ini)
+        constants.h
+    )
+    add_executable(http_server
+        http_server_small.cpp
+        DbManager.h DbManager.cpp
+        Searcher.h Searcher.cpp
+        IniParser.h IniParser.cpp
+        constants.h
+    )
     add_subdirectory(./libpqxx-7.9.0 libpqxx-build)
-    target_compile_features(cpp_search_qt_creator PRIVATE cxx_std_17)
-    target_link_libraries(cpp_search_qt_creator ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto pqxx)# "${PQXX_LIBRARIES}")
+    target_compile_features(crowler PRIVATE cxx_std_17)
+    target_compile_features(http_server PRIVATE cxx_std_17)
+    target_link_libraries(crowler ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto pqxx)# "${PQXX_LIBRARIES}")
+    target_link_libraries(http_server ${Boost_LIBRARIES} pqxx)
 endif()
 
 include(GNUInstallDirs)
-install(TARGETS cpp_search_qt_creator
+install(TARGETS crowler
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

Crowler.cpp

@@ -92,6 +92,12 @@ std::string Crowler::download(std::string url)
         // Make the connection on the IP address we get from a lookup
         beast::get_lowest_layer(stream).connect(results);
 
+        if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str()))
+        {
+            boost::system::error_code ec{ static_cast<int>(::ERR_get_error()), boost::asio::error::get_ssl_category() };
+            throw boost::system::system_error{ ec };
+        }
+
         // Perform the SSL handshake
         stream.handshake(ssl::stream_base::client);
 
@@ -174,7 +180,7 @@ void Crowler::savePresencesToDb(std::vector<std::string> words, std::string url)
 
 void Crowler::processStartPage()
 {
-    IniParser parser("/Users/tkvitko/c/netology/cpp_diploma/cpp_search_qt_creator/config.ini"); // не хочет работать с "./config.ini"
+    IniParser parser(CONFIG_PATH);
     std::string url = parser.get_value<std::string>("Crowler.startPage");
     unsigned short depth = parser.get_value<unsigned short>("Crowler.recursionDepth");
     addToCrowlingQueue(url, depth);

DbManager.cpp

@@ -7,7 +7,7 @@
 DbManager::DbManager()
 {
 
-    IniParser parser("/Users/tkvitko/c/netology/cpp_diploma/cpp_search_qt_creator/config.ini"); // не хочет работать с "./config.ini"
+    IniParser parser(CONFIG_PATH);
     std::string host = parser.get_value<std::string>("Db.host");
     std::string port = parser.get_value<std::string>("Db.port");
     std::string dbname = parser.get_value<std::string>("Db.name");

DbManager.h

@@ -4,6 +4,7 @@
 #include <string>
 #include <pqxx/pqxx>
 #include <iostream>
+#include "constants.h"
 
 
 struct WordPresence {

IniParser.h

@@ -91,6 +91,9 @@ class IniParser {
     template <>
     float get_value(std::string value_path);
 
+    template <>
+    unsigned short get_value(std::string value_path);
+
 };
 
 #endif // INIPARSER_H

Searcher.cpp

@@ -7,7 +7,12 @@ std::vector<std::string> Searcher::processSearchRequest(std::vector<std::string>
 {
     // получение ресурсов из базы данных для ответа на запрос
 
-    DbManager dbManager = DbManager();
-    std::vector<std::string> result = dbManager.getSortedUrlsByWords(words);
+    std::vector<std::string> result;
+    try {
+        DbManager dbManager = DbManager();
+        result = dbManager.getSortedUrlsByWords(words);
+    } catch (std::exception const& e) {
+        std::cout << e.what() << std::endl;
+    }
     return result;
 }

constants.h

@@ -0,0 +1,8 @@
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#include <string>
+
+const std::string CONFIG_PATH = "/Users/tkvitko/c/netology/cpp_diploma/cpp_search_qt_creator/config.ini"; // не хочет работать с "./config.ini"
+
+#endif // CONSTANTS_H