From 597fc5100dea73dace45d5024af29abde05061bd Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Mon, 2 Mar 2009 08:55:46 +0000
Subject: [PATCH] Utils/Termlib: Add some logging
---
Utils/Termlib/TelnetTerminal.cc | 24 +++++++++++++++++++++++-
Utils/Termlib/TelnetTerminal.hh | 2 ++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/Utils/Termlib/TelnetTerminal.cc b/Utils/Termlib/TelnetTerminal.cc
index 5e08938e9..2699f9caf 100644
--- a/Utils/Termlib/TelnetTerminal.cc
+++ b/Utils/Termlib/TelnetTerminal.cc
@@ -67,6 +67,8 @@ prefix_ void senf::term::TelnetTerminal::write(char ch)
prefix_ void senf::term::TelnetTerminal::v_setupComplete()
{
+ bool init (true);
+
if (setupFailed_)
v_setupFailed();
else if (! (width() > 0
@@ -74,7 +76,23 @@ prefix_ void senf::term::TelnetTerminal::v_setupComplete()
&& localOption(telnetopt::SUPPRESS_GO_AHEAD)
&& peerOption(telnetopt::SUPPRESS_GO_AHEAD)
&& localOption(telnetopt::ECHO)
- && callbacks_->cb_init())) {
+ && (init = callbacks_->cb_init()))) {
+
+ SENF_LOG_BLOCK((senf::log::NOTICE)({
+ log << "TelnetTerminal setup failed:\n";
+ if (width() <= 0)
+ log << " missing telnet client NAWS support\n";
+ if (terminalType().empty())
+ log << " missing telnet client TERMINAL_TYPE support\n";
+ if (! localOption(telnetopt::SUPPRESS_GO_AHEAD) ||
+ ! peerOption(telnetopt::SUPPRESS_GO_AHEAD))
+ log << " missing telnet clinet SGO support\n";
+ if (! localOption(telnetopt::ECHO))
+ log << " missing telnet client ECHO support\n";
+ if (! init)
+ log << " terminal initialization (cb_init) failed\n";
+ }));
+
setupFailed_ = true;
requestPeerOption(telnetopt::SUPPRESS_GO_AHEAD, false);
requestLocalOption(telnetopt::SUPPRESS_GO_AHEAD, false);
@@ -84,6 +102,10 @@ prefix_ void senf::term::TelnetTerminal::v_setupComplete()
if (! requestsPending())
v_setupFailed();
}
+ else
+ SENF_LOG((senf::log::NOTICE)(
+ "Initialized TelnetTerminal: TERM=" << terminalType()
+ << ", size=" << width() << "x" << height()));
}
prefix_ void senf::term::TelnetTerminal::v_charReceived(char ch)
diff --git a/Utils/Termlib/TelnetTerminal.hh b/Utils/Termlib/TelnetTerminal.hh
index 8d315838e..650ce1f92 100644
--- a/Utils/Termlib/TelnetTerminal.hh
+++ b/Utils/Termlib/TelnetTerminal.hh
@@ -29,6 +29,7 @@
// Custom includes
#include "Telnet.hh"
#include "AbstractTerminal.hh"
+#include "../Logger.hh"
//#include "TelnetTerminal.mpp"
///////////////////////////////hh.p////////////////////////////////////////
@@ -53,6 +54,7 @@ namespace term {
public telnethandler::NAWS,
public AbstractTerminal
{
+ SENF_LOG_CLASS_AREA();
public:
TelnetTerminal();
--
GitLab