f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Чистка кода

Browse Source
This commit is contained in:
Andrei Astafev
2019-10-04 15:33:49 +03:00
parent aaad6c2d60
commit ee11f4b875
11 changed files with 91 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/filesystem/paths.cpp
View File

@@ -125,18 +125,19 @@ void Paths::setConfigFile( const QString& configFile )
bool Paths::updatePaths()
{
char* path = nullptr;
int length, dirname_length;
int fullPathLength;
int dirNameLength;
length = wai_getExecutablePath( nullptr, 0, &dirname_length );
if ( length > 0 )
fullPathLength = wai_getExecutablePath( nullptr, 0, &dirNameLength );
if ( fullPathLength > 0 )
{
path = static_cast< char* >( malloc( static_cast< size_t >( length ) + 1 ) );
if ( !path )
path = new( std::nothrow ) char[static_cast< size_t >( fullPathLength ) + 1 ];
if ( path == nullptr )
{
return( false );
}
wai_getExecutablePath( path, length, &dirname_length );
path[length] = '\0';
wai_getExecutablePath( path, fullPathLength, &dirNameLength );
path[fullPathLength] = '\0';
}
else
{
@@ -144,9 +145,9 @@ bool Paths::updatePaths()
}
m_executableFile = QFile( path );
path[dirname_length] = '\0';
path[dirNameLength] = '\0';
m_binaryDirectory = path;
free( path );
delete [] path;
if ( m_binaryDirectory.absolutePath().endsWith( "/bin" ) )
{

2
src/filesystem/paths.hpp
View File

@@ -42,7 +42,7 @@ public:
bool updatePaths();
bool makePaths();
QString findConfigFile( const QString& defaultConfigFile = "" );
QString findConfigFile( const QString& defaultConfigFile = QLatin1String("") );
}; // class Paths
} // namespace filesystem

42
src/log/spdlog.cpp
View File

@@ -1,11 +1,11 @@
#include "config.hpp"
#include "spdlog.hpp"
#include "config.hpp"
namespace myx {
namespace log {
Logger defaultLogger( "default" );
Logger default_logger( "default" );
spdlog::level::level_enum Logger::outputLevel() const
@@ -14,7 +14,7 @@ spdlog::level::level_enum Logger::outputLevel() const
}
void Logger::setOutputLevel( const spdlog::level::level_enum& outputLevel )
void Logger::setOutputLevel( const spdlog::level::level_enum outputLevel )
{
m_outputLevel = outputLevel;
}
@@ -26,7 +26,7 @@ spdlog::level::level_enum Logger::flushLevel() const
}
void Logger::setFlushLevel( const spdlog::level::level_enum& flushLevel )
void Logger::setFlushLevel( const spdlog::level::level_enum flushLevel )
{
m_flushLevel = flushLevel;
}
@@ -44,12 +44,12 @@ void Logger::setOutputPattern( const std::string& outputPattern )
}
Logger::Logger( const std::string& name ) :
Logger::Logger( std::string name ) :
m_logger( nullptr ),
m_name( name ),
m_name( std::move( name ) ),
m_outputPattern( "[%H:%M:%S %z] [%n] [%^---%L---%$] %v" ),
m_baseFileName( fmt::format( "{}_{}", PROJECT_NAME, "st" ) ),
m_maxRotatingFileSize( 256 * 1024 ),
m_maxRotatingFileSize( rotatingFileSize ),
m_maxRotatingFilesCount( 3 ),
m_outputLevel( spdlog::level::trace ),
m_flushLevel( spdlog::level::warn ),
@@ -113,8 +113,8 @@ void Logger::disableNullSink()
{
if ( m_nullSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_nullSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_nullSink ), sinks.end() );
m_nullSink.reset();
m_nullSink = nullptr;
}
@@ -135,8 +135,8 @@ void Logger::disableStdoutSink()
{
if ( m_stdoutSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_stdoutSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_stdoutSink ), sinks.end() );
m_stdoutSink.reset();
m_stdoutSink = nullptr;
}
@@ -157,8 +157,8 @@ void Logger::disableStderrSink()
{
if ( m_stderrSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_stderrSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_stderrSink ), sinks.end() );
m_stderrSink.reset();
m_stderrSink = nullptr;
}
@@ -179,8 +179,8 @@ void Logger::disableSyslogSink()
{
if ( m_syslogSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_syslogSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_syslogSink ), sinks.end() );
m_syslogSink.reset();
m_syslogSink = nullptr;
}
@@ -201,8 +201,8 @@ void Logger::disableBasicFileSink()
{
if ( m_basicFileSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_basicFileSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_basicFileSink ), sinks.end() );
m_basicFileSink.reset();
m_basicFileSink = nullptr;
}
@@ -223,8 +223,8 @@ void Logger::disableRotatingFileSink()
{
if ( m_rotatingFileSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_rotatingFileSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_rotatingFileSink ), sinks.end() );
m_rotatingFileSink.reset();
m_rotatingFileSink = nullptr;
}
@@ -247,8 +247,8 @@ void Logger::disableDailyFileSink()
{
if ( m_dailyFileSink != nullptr )
{
m_logger->sinks().erase( std::remove( m_logger->sinks().begin(), m_logger->sinks().end(), m_dailyFileSink ),
m_logger->sinks().end() );
auto sinks = m_logger->sinks();
sinks.erase( std::remove( sinks.begin(), sinks.end(), m_dailyFileSink ), sinks.end() );
m_dailyFileSink.reset();
m_dailyFileSink = nullptr;
}

35
src/log/spdlog.hpp
View File

@@ -1,6 +1,7 @@
#ifndef MYX_LOG_SPDLOG_HPP_
#define MYX_LOG_SPDLOG_HPP_
#include <spdlog/sinks/sink.h>
#include <spdlog/sinks/null_sink.h>
#include <spdlog/sinks/syslog_sink.h>
#include <spdlog/sinks/basic_file_sink.h>
@@ -11,6 +12,8 @@ namespace myx {
namespace log {
const size_t rotatingFileSize = 256 * 1024;
class Logger
{
std::shared_ptr< spdlog::logger > m_logger;
@@ -30,7 +33,7 @@ class Logger
std::shared_ptr< spdlog::sinks::daily_file_sink_st > m_dailyFileSink;
public:
Logger( const std::string& name );
Logger( std::string name );
void init();
std::shared_ptr< spdlog::logger > logger();
@@ -54,61 +57,61 @@ public:
void enableDailyFileSink();
void disableDailyFileSink();
spdlog::level::level_enum outputLevel() const;
void setOutputLevel( const spdlog::level::level_enum& outputLevel );
void setOutputLevel( const spdlog::level::level_enum outputLevel );
spdlog::level::level_enum flushLevel() const;
void setFlushLevel( const spdlog::level::level_enum& flushLevel );
void setFlushLevel( const spdlog::level::level_enum flushLevel );
std::string outputPattern() const;
void setOutputPattern( const std::string& outputPattern );
}; // class Logger
extern Logger defaultLogger;
extern Logger default_logger;
template < class F, class ... Args >
void trace( F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->trace( std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->trace( std::forward< F >( format ),
std::forward< Args >( args )... );
}
template < class F, class ... Args >
void debug( F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->debug( std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->debug( std::forward< F >( format ),
std::forward< Args >( args )... );
}
template < class F, class ... Args >
void info( F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->info( std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->info( std::forward< F >( format ),
std::forward< Args >( args )... );
}
template < class F, class ... Args >
void warn( F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->warn( std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->warn( std::forward< F >( format ),
std::forward< Args >( args )... );
}
template < class F, class ... Args >
void error( F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->error( std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->error( std::forward< F >( format ),
std::forward< Args >( args )... );
}
template < class F, class ... Args >
void log( spdlog::level::level_enum lv, F&& format, Args&& ... args ) noexcept
{
defaultLogger.logger()->log( lv, std::forward< F >( format ),
std::forward< Args >( args )... );
default_logger.logger()->log( lv, std::forward< F >( format ),
std::forward< Args >( args )... );
}
} // namespace log

17
src/log/spdlog_qt.cpp
View File

@@ -9,30 +9,31 @@ namespace log {
void spdlog_qt_message_handler( QtMsgType type, const QMessageLogContext& context, const QString& qMsg )
{
if ( !defaultLogger.logger() )
Q_UNUSED( context )
if ( !default_logger.logger() )
{
return;
}
Q_UNUSED( context )
const char* msg = qMsg.toUtf8().constData();
auto message = qMsg.toUtf8();
switch ( type )
{
case QtDebugMsg:
defaultLogger.logger()->debug( msg );
default_logger.logger()->debug( message.constData() );
break;
case QtInfoMsg:
defaultLogger.logger()->info( msg );
default_logger.logger()->info( message.constData() );
break;
case QtWarningMsg:
defaultLogger.logger()->warn( msg );
default_logger.logger()->warn( message.constData() );
break;
case QtCriticalMsg:
defaultLogger.logger()->critical( msg );
default_logger.logger()->critical( message.constData() );
break;
case QtFatalMsg:
defaultLogger.logger()->critical( "FATAL: %s", msg );
default_logger.logger()->critical( "FATAL: %s", message.constData() );
QCoreApplication::exit( 1 );
break;
}