Re-add debug ring buffer and print its contents on a lua crash - advtrains.git

diff options

author	orwell96 <mono96.mml@gmail.com>	2017-05-15 13:37:06 +0200
committer	orwell96 <mono96.mml@gmail.com>	2017-05-30 09:20:01 +0200
commit	e484654f896a40910cdeefdc2ac64ea8e9556c89 (patch)
tree	3871961349b93a2dfae4781a2f5c907370553b3b /advtrains_luaautomation
parent	74c8784b21c635ae310773e7105d22e3928a049a (diff)
download	advtrains-e484654f896a40910cdeefdc2ac64ea8e9556c89.tar.gz advtrains-e484654f896a40910cdeefdc2ac64ea8e9556c89.tar.bz2 advtrains-e484654f896a40910cdeefdc2ac64ea8e9556c89.zip

Re-add debug ring buffer and print its contents on a lua crash

When the crash on linuxworks has been fixed, the ringbuffer will go into master and behind an option also fix last commit

Diffstat (limited to 'advtrains_luaautomation')

0 files changed, 0 insertions, 0 deletions

/* Minetest Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "ban.h" #include <fstream> #include <jmutexautolock.h> #include <sstream> #include <set> #include "strfnd.h" #include "log.h" BanManager::BanManager(const std::string &banfilepath): m_banfilepath(banfilepath), m_modified(false) { m_mutex.Init(); try{ load(); } catch(SerializationError &e) { infostream<<"WARNING: BanManager: creating " <<m_banfilepath<<std::endl; } } BanManager::~BanManager() { save(); } void BanManager::load() { JMutexAutoLock lock(m_mutex); infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl; std::ifstream is(m_banfilepath.c_str(), std::ios::binary); if(is.good() == false) { infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl; throw SerializationError("BanManager::load(): Couldn't open file"); } for(;;) { if(is.eof() || is.good() == false) break; std::string line; std::getline(is, line, '\n'); Strfnd f(line); std::string ip = trim(f.next("|")); std::string name = trim(f.next("|")); if(ip.empty()) continue; m_ips[ip] = name; } m_modified = false; } void BanManager::save() { JMutexAutoLock lock(m_mutex); infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl; std::ofstream os(m_banfilepath.c_str(), std::ios::binary); if(os.good() == false) { infostream<<"BanManager: failed saving to "<<m_banfilepath<<std::endl; throw SerializationError("BanManager::load(): Couldn't open file"); } for(std::map<std::string, std::string>::iterator i = m_ips.begin(); i != m_ips.end(); i++) { os<<i->first<<"|"<<i->second<<"\n"; } m_modified = false; } bool BanManager::isIpBanned(const std::string &ip) { JMutexAutoLock lock(m_mutex); return m_ips.find(ip) != m_ips.end(); } std::string BanManager::getBanDescription(const std::string &ip_or_name) { JMutexAutoLock lock(m_mutex); std::string s = ""; for(std::map<std::string, std::string>::iterator i = m_ips.begin(); i != m_ips.end(); i++) { if(i->first == ip_or_name || i->second == ip_or_name || ip_or_name == "") s += i->first + "|" + i->second + ", "; } s = s.substr(0, s.size()-2); return s; } std::string BanManager::getBanName(const std::string &ip) { JMutexAutoLock lock(m_mutex); std::map<std::string, std::string>::iterator i = m_ips.find(ip); if(i == m_ips.end()) return ""; return i->second; } void BanManager::add(const std::string &ip, const std::string &name) { JMutexAutoLock lock(m_mutex); m_ips[ip] = name; m_modified = true; } void BanManager::remove(const std::string &ip_or_name) { JMutexAutoLock lock(m_mutex); //m_ips.erase(m_ips.find(ip)); // Find out all ip-name pairs that match the ip or name std::set<std::string> ips_to_delete; for(std::map<std::string, std::string>::iterator i = m_ips.begin(); i != m_ips.end(); i++) { if(i->first == ip_or_name || i->second == ip_or_name) ips_to_delete.insert(i->first); } // Erase them for(std::set<std::string>::iterator i = ips_to_delete.begin(); i != ips_to_delete.end(); i++) { m_ips.erase(*i); } m_modified = true; } bool BanManager::isModified() { JMutexAutoLock lock(m_mutex); return m_modified; }


context:
space:
mode: