diff --git a/slides/020-snodec-ueberblick/01300_snode.c-application-server-socketcontext.tex b/slides/020-snodec-ueberblick/01300_snode.c-application-server-socketcontext.tex index 68862e4..1cc0bd8 100644 --- a/slides/020-snodec-ueberblick/01300_snode.c-application-server-socketcontext.tex +++ b/slides/020-snodec-ueberblick/01300_snode.c-application-server-socketcontext.tex @@ -2,17 +2,19 @@ \begin{frame}[fragile]{\texttt{SocketContext} of the Server} \begin{cppcode}[autogobble=true, caption={\alert{SocketContext} of the server.},captionpos=b] + #include + class EchoServerContext : public core::socket::stream::SocketContext { public: using core::socket::stream::SocketContext::SocketContext; // constructor inheritance (since C++11) private: void onConnected() override { - VLOG(0) << "Echo connected to " << getSocketConnection()->getRemoteAddress().toString(); + snode::semantic::appLog().trace() << "Echo connected to " << getSocketConnection()->getRemoteAddress().toString(); } void onDisconnected() override { - VLOG(0) << "Echo disconnected from " << getSocketConnection()->getRemoteAddress().toString(); + snode::semantic::appLog().trace() << "Echo disconnected from " << getSocketConnection()->getRemoteAddress().toString(); } std::size_t onReceivedFromPeer() override { @@ -20,7 +22,7 @@ std::size_t junkLen = readFromPeer(junk, 4096); if (junkLen > 0) { - VLOG(0) << "Data to reflect: " << std::string(junk, junkLen); + snode::semantic::appLog().trace() << "Data to reflect: " << std::string(junk, junkLen); sendToPeer(junk, junkLen); } return junkLen; diff --git a/slides/020-snodec-ueberblick/01400_snode.c-application-client-socketcontext.tex b/slides/020-snodec-ueberblick/01400_snode.c-application-client-socketcontext.tex index e34d496..a7f528e 100644 --- a/slides/020-snodec-ueberblick/01400_snode.c-application-client-socketcontext.tex +++ b/slides/020-snodec-ueberblick/01400_snode.c-application-client-socketcontext.tex @@ -2,19 +2,21 @@ \begin{frame}[fragile]{\texttt{SocketContext} of the Client} \begin{cppcode}[autogobble=true, caption={\alert{SocketContext} of the client.},captionpos=b] + #include + class EchoClientContext : public core::socket::stream::SocketContext { public: using core::socket::stream::SocketContext::SocketContext; // constructor inheritance (since C++11) private: void onConnected() override {. - VLOG(0) << "Echo connected to " << socketConnection->getRemoteAddress().toString(); - VLOG(0) << "Initiating data exchange"; + snode::semantic::appLog().trace() << "Echo connected to " << socketConnection->getRemoteAddress().toString(); + snode::semantic::appLog().trace() << "Initiating data exchange"; sendToPeer("Hello peer! It's nice talking to you!!!"); } void onDisconnected() override { - VLOG(0) << "Echo disconnected from " << socketConnection->getRemoteAddress().toString(); + snode::semantic::appLog().trace() << "Echo disconnected from " << socketConnection->getRemoteAddress().toString(); } std::size_t onReceivedFromPeer() override { @@ -22,7 +24,7 @@ std::size_t junkLen = readFromPeer(junk, 4096); if (junkLen > 0) { - VLOG(0) << "Data to reflect: " << std::string(junk, junkLen); + snode::semantic::appLog().trace() << "Data to reflect: " << std::string(junk, junkLen); sendToPeer(junk, junkLen); } return junkLen; diff --git a/slides/020-snodec-ueberblick/01500_snode.c-application-server-main.tex b/slides/020-snodec-ueberblick/01500_snode.c-application-server-main.tex index c2e2a76..1e119b6 100644 --- a/slides/020-snodec-ueberblick/01500_snode.c-application-server-main.tex +++ b/slides/020-snodec-ueberblick/01500_snode.c-application-server-main.tex @@ -3,6 +3,7 @@ \begin{frame}[fragile]{The IPv4 Server Application} \begin{cppcode}[autogobble=true, caption={IPv4 server application.},captionpos=b, morekeywords={[2]{SocketServer,EchoServerContextFactory,listen}}] #include "EchoServerContextFactory.h" + #include #include int main(int argc, char* argv[]) { @@ -15,16 +16,16 @@ const core::socket::State& state) -> void { switch (state) { case core::socket::State::OK: - VLOG(1) << "EchoServer: connected to '" << socketAddress.toString() << "'"; + snode::semantic::appLog().trace() << "EchoServer: connected to '" << socketAddress.toString() << "'"; break; case core::socket::State::DISABLED: - VLOG(1) << "EchoServer: disabled"; + snode::semantic::appLog().trace() << "EchoServer: disabled"; break; case core::socket::State::ERROR: - LOG(ERROR) << "EchoServer: " << socketAddress.toString() << ": " << state.what(); + snode::semantic::appLog().error() << "EchoServer: " << socketAddress.toString() << ": " << state.what(); break; case core::socket::State::FATAL: - LOG(FATAL) << "EchoServer: " << socketAddress.toString() << ": " << state.what(); + snode::semantic::appLog().critical() << "EchoServer: " << socketAddress.toString() << ": " << state.what(); break; } return core::SNodeC::start(); diff --git a/slides/020-snodec-ueberblick/01600_snode.c-application-client-main.tex b/slides/020-snodec-ueberblick/01600_snode.c-application-client-main.tex index 4860852..433eee5 100644 --- a/slides/020-snodec-ueberblick/01600_snode.c-application-client-main.tex +++ b/slides/020-snodec-ueberblick/01600_snode.c-application-client-main.tex @@ -3,6 +3,7 @@ \begin{frame}[fragile]{The IPv4 Client Application} \begin{cppcode}[autogobble=true, caption={IPv4 client application.},captionpos=b,, morekeywords={[2]{SocketClient,EchoClientContextFactory,connect}}] #include "EchoClientContextFactory.h" + #include #include int main(int argc, char* argv[]) { @@ -15,16 +16,16 @@ const core::socket::State& state) -> void { switch (state) { case core::socket::State::OK: - VLOG(1) << "EchoClient: connected to '" << socketAddress.toString() << "'"; + snode::semantic::appLog().trace() << "EchoClient: connected to '" << socketAddress.toString() << "'"; break; case core::socket::State::DISABLED: - VLOG(1) << "EchoClient: disabled"; + snode::semantic::appLog().trace() << "EchoClient: disabled"; break; case core::socket::State::ERROR: - LOG(ERROR) << "EchoClient: " << socketAddress.toString() << ": " << state.what(); + snode::semantic::appLog().error() << "EchoClient: " << socketAddress.toString() << ": " << state.what(); break; case core::socket::State::FATAL: - LOG(FATAL) << "EchoClient: " << socketAddress.toString() << ": " << state.what(); + snode::semantic::appLog().critical() << "EchoClient: " << socketAddress.toString() << ": " << state.what(); break; } return core::SNodeC::start(); diff --git a/slides/020-snodec-ueberblick/02710_websocket-application-client.tex b/slides/020-snodec-ueberblick/02710_websocket-application-client.tex index 1e6a471..2193899 100644 --- a/slides/020-snodec-ueberblick/02710_websocket-application-client.tex +++ b/slides/020-snodec-ueberblick/02710_websocket-application-client.tex @@ -1,6 +1,7 @@ \begin{frame}[fragile]{WebSocket Client-Application} \begin{cppcode}[autogobble=true, caption={WebSocket Client-Application.},captionpos=b,morekeywords={[2]{upgrade,connect,Request,Response}}] #include "web/http/legacy/in/Client.h" + #include using LegacyClient = web::http::legacy::in::Client; using Request = LegacyClient::Request; @@ -8,19 +9,19 @@ const LegacyClient legacyClient( [](const std::shared_ptr& req) -> void { // Connection start and therefore also Request start - LOG(INFO) << "OnRequestBegin"; + snode::semantic::appLog().info() << "OnRequestBegin"; req->set("Sec-WebSocket-Protocol", "echo"); req->upgrade("/ws/", "websocket", [](const std::shared_ptr& req, const std::shared_ptr& res) -> void { - VLOG(1) << "OnResponse"; + snode::semantic::appLog().trace() << "OnResponse"; req->upgrade(res, [](bool success) -> void { // Failure processing (logging) }); }); }, [](const std::shared_ptr& req) -> void {// Connection and therefore also Request end - LOG(INFO) << "OnRequestEnd"; + snode::semantic::appLog().info() << "OnRequestEnd"; } ); diff --git a/slides/020-snodec-ueberblick/09000_test.tex b/slides/020-snodec-ueberblick/09000_test.tex index e9ec853..33daa88 100644 --- a/slides/020-snodec-ueberblick/09000_test.tex +++ b/slides/020-snodec-ueberblick/09000_test.tex @@ -33,6 +33,8 @@ % \begin{cppcode}[autogobble=true,alsoletter={?_}, % columns=fullflexible, % morekeywords={using},morekeywords={[2]{SocketContext,Test}}] +% #include +% % class EchoServerContext : public core::socket::stream::SocketContext { % public: % using core::socket::stream::SocketContext::SocketContext; // constructor inheritance (since C++11) @@ -43,7 +45,7 @@ % % std::size_t junkLen = readFromPeer(junk, 4096); % if (junkLen > 0) { -% VLOG(0) << "Data to reflect: " << std::string(junk, junkLen); +% snode::semantic::appLog().trace() << "Data to reflect: " << std::string(junk, junkLen); % sendToPeer(junk, junkLen); % } % return junkLen;