diff options
| -rw-r--r-- | .editorconfig | 5 | ||||
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | xmake.lua | 2 | ||||
| -rw-r--r-- | zenhttp/httpasio.cpp | 4 |
4 files changed, 20 insertions, 5 deletions
diff --git a/.editorconfig b/.editorconfig index e81597314..d84a64670 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,14 @@ # Visual Studio generated .editorconfig file with C++ settings. root = true +# Baseline +[*] +charset = utf-8 indent_style = tab indent_size = 4 +tab_width = 4 trim_trailing_whitespace = true +max_line_length = 120 insert_final_newline = true [*.{cpp,h,inl}] @@ -8,7 +8,7 @@ Zen is currently EXPERIMENTAL and not intended to be used in production. We will Zen can also be deployed as a shared instance for use as a shared cache. It also supports upstream connectivity to cloud storage services as well as other Zen server instances. -All platforms require [xmake](xmake.io) +All platforms require [xmake](https://xmake.io) Download the latest release [here](https://github.com/xmake-io/xmake/releases) @@ -77,8 +77,8 @@ for Ubuntu 21.04 onwards); sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test ``` -Now GCC-11 can be install via Apt. This will also install a suitable version of -the C++ library too; +Now GCC-11 can be installed via Apt. This will also install a suitable version of +the C++ library; ``` sudo apt install -y --no-install-recommends g++-11 @@ -102,7 +102,13 @@ sudo dpkg -i xmake-v2.6.4.amd64.deb xmake --version ``` -For some of Zen's third party dependencies are provided by Microsoft's `vcpkg` +To build some of the packages from vcpkg you may need some additional tools. Install the following; + +``` +sudo apt-get install build-essential +``` + +Some of Zen's third party dependencies are provided by Microsoft's `vcpkg` C++ library manager. After cloning the project there is an initialisation step; ``` @@ -7,7 +7,7 @@ set_version(zenversion, { build = "%Y%m%d%H%M" }) add_requires( "vcpkg::asio", - "vcpkg::catch2", + "vcpkg::catch2 2.13.8", "vcpkg::cpr", "vcpkg::curl", "vcpkg::cxxopts", diff --git a/zenhttp/httpasio.cpp b/zenhttp/httpasio.cpp index 45994bb67..81ceef888 100644 --- a/zenhttp/httpasio.cpp +++ b/zenhttp/httpasio.cpp @@ -1155,6 +1155,8 @@ HttpAsioServerImpl::Start(uint16_t Port, int ThreadCount) { ZEN_ASSERT(ThreadCount > 0); + ZEN_INFO("starting asio http with {} service threads", ThreadCount); + m_Acceptor.reset(new asio_http::HttpAcceptor(*this, m_IoService, Port)); m_Acceptor->Start(); @@ -1174,6 +1176,8 @@ HttpAsioServerImpl::Start(uint16_t Port, int ThreadCount) }); } + ZEN_INFO("asio http started (port {})", m_Acceptor->GetAcceptPort()); + return m_Acceptor->GetAcceptPort(); } |