summaryrefslogtreecommitdiff
path: root/src/log.cpp
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-07-25 07:43:32 +0200
committerest31 <MTest31@outlook.com>2015-11-06 08:51:14 +0100
commit5e507c9829942c434a6f1ae7a4f3a488c7e50bef (patch)
treee7bd38e0dabc494e077f37a5cb16dae3dededea7 /src/log.cpp
parent1384108f8c32f309852c1d1665a613f2a3e3fcc2 (diff)
downloadminetest-5e507c9829942c434a6f1ae7a4f3a488c7e50bef.tar.gz
minetest-5e507c9829942c434a6f1ae7a4f3a488c7e50bef.tar.bz2
minetest-5e507c9829942c434a6f1ae7a4f3a488c7e50bef.zip
Add server side ncurses terminal
This adds a chat console the server owner can use for administration or to talk with players. It runs in its own thread, which makes the user interface immune to the server's lag, behaving just like a client, except timeout. As it uses the same console code as the f10 console, things like nick completion or a scroll buffer basically come for free. The terminal itself is written in a general way so that adding a client version later on is just about implementing an interface. Fatal errors are printed after the console exists and the ncurses terminal buffer gets cleaned up with endwin(), so that the error still remains visible. The server owner can chose their username their entered text will have in chat and where players can send PMs to. Once the username is secured with a password to prevent anybody to take over the server, the owner can execute admin tasks over the console. This change includes a contribution by @kahrl who has improved ncurses library detection.
Diffstat (limited to 'src/log.cpp')
-rw-r--r--src/log.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/log.cpp b/src/log.cpp
index 5cba8f700..600e715c1 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -181,6 +181,14 @@ void Logger::addOutput(ILogOutput *out, LogLevel lev)
m_outputs[lev].push_back(out);
}
+void Logger::addOutputMasked(ILogOutput *out, LogLevelMask mask)
+{
+ for (size_t i = 0; i < LL_MAX; i++) {
+ if (mask & LOGLEVEL_TO_MASKLEVEL(i))
+ m_outputs[i].push_back(out);
+ }
+}
+
void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev)
{
assert(lev < LL_MAX);
@@ -188,15 +196,19 @@ void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev)
m_outputs[i].push_back(out);
}
-void Logger::removeOutput(ILogOutput *out)
+LogLevelMask Logger::removeOutput(ILogOutput *out)
{
+ LogLevelMask ret_mask = 0;
for (size_t i = 0; i < LL_MAX; i++) {
std::vector<ILogOutput *>::iterator it;
it = std::find(m_outputs[i].begin(), m_outputs[i].end(), out);
- if (it != m_outputs[i].end())
+ if (it != m_outputs[i].end()) {
+ ret_mask |= LOGLEVEL_TO_MASKLEVEL(i);
m_outputs[i].erase(it);
+ }
}
+ return ret_mask;
}
void Logger::setLevelSilenced(LogLevel lev, bool silenced)