Skip to content

Use a std::function callback rather then std::cout to log data #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bamkrs wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use a std::function callback rather then std::cout to log data #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f1fa7c
Use a std::function Callback rather then std::cout to log data from p…
Oct 24, 2016
8c04270
Hardened Log-Callback
Oct 24, 2016
128be9c
Moved Declaration to if-block, too
Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions include/endpoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include "listener.h"
#include "net.h"
#include "http.h"
#include <functional>
#include <iostream>

namespace Net {

Expand Down Expand Up @@ -52,12 +54,18 @@ class Endpoint {
return listener.isBound();
}

void setLogCallback(std::function<void(std::string)> cb){
logCallback_ = cb;
}

Async::Promise<Tcp::Listener::Load> requestLoad(const Tcp::Listener::Load& old);

static Options options();

private:

std::function<void(std::string)> logCallback_;

template<typename Method>
void serveImpl(Method method)
{
Expand All @@ -68,9 +76,15 @@ class Endpoint {
listener.setHandler(handler_);

if (listener.bind()) {
const auto& addr = listener.address();
std::cout << "Now listening on " << "http://" + addr.host() << ":"
<< addr.port() << std::endl;
if(logCallback_)
{
const auto& addr = listener.address();
std::string out = "Now listening on http://";
out.append(addr.host());
out.append(":");
out.append(std::to_string(addr.port()));
logCallback_(out);
}
CALL_MEMBER_FN(listener, method)();
}
#undef CALL_MEMBER_FN
Expand Down
10 changes: 6 additions & 4 deletions src/server/endpoint.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ Endpoint::Options::backlog(int val) {
return *this;
}

Endpoint::Endpoint()
{ }
Endpoint::Endpoint() {
logCallback_ = [](std::string log) { std::cout << log << std::endl; };
}

Endpoint::Endpoint(const Net::Address& addr)
: listener(addr)
{ }
: listener(addr) {
logCallback_ = [](std::string log) { std::cout << log << std::endl; };
}

void
Endpoint::init(const Endpoint::Options& options) {
Expand Down