From ce7979bd7d6278bc1b67cf46a73a3d23e02a6ae5 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 11 Dec 2019 12:31:21 +0000 Subject: Extract port binding code to a function and improve output. --- src/configreader.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index 2a1da8fd8..0f2063a60 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -510,13 +510,12 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) ServerInstance->BindPorts(pl); if (pl.size()) { - errstr << "Not all your client ports could be bound." << std::endl - << "The following port(s) failed to bind:" << std::endl; - - int j = 1; - for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) + std::cout << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl; + for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter) { - errstr << j << ".\tAddress: " << i->first.str() << "\tReason: " << strerror(i->second) << std::endl; + const FailedPort& fp = *iter; + errstr << " " << fp.sa.str() << ": " << strerror(fp.error) << std::endl + << " " << "Created from tag at " << fp.tag->getTagLocation() << std::endl; } } } -- cgit v1.3.1-10-gc9f91