mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-11-04 09:15:29 +01:00 
			
		
		
		
	Ban and Auth managers use infostream rather than dstream
This commit is contained in:
		
							
								
								
									
										12
									
								
								src/auth.cpp
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/auth.cpp
									
									
									
									
									
								
							@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 | 
			
		||||
//#include "main.h" // for g_settings
 | 
			
		||||
#include <sstream>
 | 
			
		||||
#include "strfnd.h"
 | 
			
		||||
#include "debug.h"
 | 
			
		||||
#include "log.h"
 | 
			
		||||
 | 
			
		||||
std::set<std::string> privsToSet(u64 privs)
 | 
			
		||||
{
 | 
			
		||||
@@ -123,7 +123,7 @@ AuthManager::AuthManager(const std::string &authfilepath):
 | 
			
		||||
	}
 | 
			
		||||
	catch(SerializationError &e)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"WARNING: AuthManager: creating "
 | 
			
		||||
		infostream<<"WARNING: AuthManager: creating "
 | 
			
		||||
				<<m_authfilepath<<std::endl;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -137,11 +137,11 @@ void AuthManager::load()
 | 
			
		||||
{
 | 
			
		||||
	JMutexAutoLock lock(m_mutex);
 | 
			
		||||
	
 | 
			
		||||
	dstream<<"AuthManager: loading from "<<m_authfilepath<<std::endl;
 | 
			
		||||
	infostream<<"AuthManager: loading from "<<m_authfilepath<<std::endl;
 | 
			
		||||
	std::ifstream is(m_authfilepath.c_str(), std::ios::binary);
 | 
			
		||||
	if(is.good() == false)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"AuthManager: failed loading from "<<m_authfilepath<<std::endl;
 | 
			
		||||
		infostream<<"AuthManager: failed loading from "<<m_authfilepath<<std::endl;
 | 
			
		||||
		throw SerializationError("AuthManager::load(): Couldn't open file");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -183,11 +183,11 @@ void AuthManager::save()
 | 
			
		||||
{
 | 
			
		||||
	JMutexAutoLock lock(m_mutex);
 | 
			
		||||
	
 | 
			
		||||
	dstream<<"AuthManager: saving to "<<m_authfilepath<<std::endl;
 | 
			
		||||
	infostream<<"AuthManager: saving to "<<m_authfilepath<<std::endl;
 | 
			
		||||
	std::ofstream os(m_authfilepath.c_str(), std::ios::binary);
 | 
			
		||||
	if(os.good() == false)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"AuthManager: failed saving to "<<m_authfilepath<<std::endl;
 | 
			
		||||
		infostream<<"AuthManager: failed saving to "<<m_authfilepath<<std::endl;
 | 
			
		||||
		throw SerializationError("AuthManager::save(): Couldn't open file");
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								src/ban.cpp
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/ban.cpp
									
									
									
									
									
								
							@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 | 
			
		||||
#include <sstream>
 | 
			
		||||
#include <set>
 | 
			
		||||
#include "strfnd.h"
 | 
			
		||||
#include "debug.h"
 | 
			
		||||
#include "log.h"
 | 
			
		||||
 | 
			
		||||
BanManager::BanManager(const std::string &banfilepath):
 | 
			
		||||
		m_banfilepath(banfilepath),
 | 
			
		||||
@@ -35,7 +35,7 @@ BanManager::BanManager(const std::string &banfilepath):
 | 
			
		||||
	}
 | 
			
		||||
	catch(SerializationError &e)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"WARNING: BanManager: creating "
 | 
			
		||||
		infostream<<"WARNING: BanManager: creating "
 | 
			
		||||
				<<m_banfilepath<<std::endl;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -48,11 +48,11 @@ BanManager::~BanManager()
 | 
			
		||||
void BanManager::load()
 | 
			
		||||
{
 | 
			
		||||
	JMutexAutoLock lock(m_mutex);
 | 
			
		||||
	dstream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
	infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
	std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
 | 
			
		||||
	if(is.good() == false)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
		infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
		throw SerializationError("BanManager::load(): Couldn't open file");
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
@@ -75,12 +75,12 @@ void BanManager::load()
 | 
			
		||||
void BanManager::save()
 | 
			
		||||
{
 | 
			
		||||
	JMutexAutoLock lock(m_mutex);
 | 
			
		||||
	dstream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
 | 
			
		||||
	infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
 | 
			
		||||
	std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
 | 
			
		||||
	
 | 
			
		||||
	if(os.good() == false)
 | 
			
		||||
	{
 | 
			
		||||
		dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
		infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 | 
			
		||||
		throw SerializationError("BanManager::load(): Couldn't open file");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user