Jonathan Naylor
9 years ago
parent
f137449ae6
commit
79e006d4b9
@ -0,0 +1,163 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "Conf.h"
|
||||||
|
#include "Log.h"
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstring>
|
||||||
|
#include <cctype>
|
||||||
|
|
||||||
|
const int BUFFER_SIZE = 500;
|
||||||
|
|
||||||
|
enum SECTION {
|
||||||
|
SECTION_NONE,
|
||||||
|
SECTION_GENERAL,
|
||||||
|
SECTION_INFO,
|
||||||
|
SECTION_LOG,
|
||||||
|
SECTION_NETWORK
|
||||||
|
};
|
||||||
|
|
||||||
|
CConf::CConf(const std::string& file) :
|
||||||
|
m_file(file),
|
||||||
|
m_daemon(false),
|
||||||
|
m_name(),
|
||||||
|
m_description(),
|
||||||
|
m_logDisplayLevel(0U),
|
||||||
|
m_logFileLevel(0U),
|
||||||
|
m_logFilePath(),
|
||||||
|
m_logFileRoot(),
|
||||||
|
m_networkPort(0U),
|
||||||
|
m_networkDebug(false)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
CConf::~CConf()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CConf::read()
|
||||||
|
{
|
||||||
|
FILE* fp = ::fopen(m_file.c_str(), "rt");
|
||||||
|
if (fp == NULL) {
|
||||||
|
::fprintf(stderr, "Couldn't open the .ini file - %s\n", m_file.c_str());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION section = SECTION_NONE;
|
||||||
|
|
||||||
|
char buffer[BUFFER_SIZE];
|
||||||
|
while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) {
|
||||||
|
if (buffer[0U] == '#')
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (buffer[0U] == '[') {
|
||||||
|
if (::strncmp(buffer, "[General]", 9U) == 0)
|
||||||
|
section = SECTION_GENERAL;
|
||||||
|
else if (::strncmp(buffer, "[Info]", 6U) == 0)
|
||||||
|
section = SECTION_INFO;
|
||||||
|
else if (::strncmp(buffer, "[Log]", 5U) == 0)
|
||||||
|
section = SECTION_LOG;
|
||||||
|
else if (::strncmp(buffer, "[Network]", 9U) == 0)
|
||||||
|
section = SECTION_NETWORK;
|
||||||
|
else
|
||||||
|
section = SECTION_NONE;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* key = ::strtok(buffer, " \t=\r\n");
|
||||||
|
if (key == NULL)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
char* value = ::strtok(NULL, "\r\n");
|
||||||
|
if (section == SECTION_GENERAL) {
|
||||||
|
if (::strcmp(key, "Daemon") == 0)
|
||||||
|
m_daemon = ::atoi(value) == 1;
|
||||||
|
} else if (section == SECTION_INFO) {
|
||||||
|
if (::strcmp(key, "Name") == 0)
|
||||||
|
m_name = value;
|
||||||
|
else if (::strcmp(key, "Description") == 0)
|
||||||
|
m_description = value;
|
||||||
|
} else if (section == SECTION_LOG) {
|
||||||
|
if (::strcmp(key, "FilePath") == 0)
|
||||||
|
m_logFilePath = value;
|
||||||
|
else if (::strcmp(key, "FileRoot") == 0)
|
||||||
|
m_logFileRoot = value;
|
||||||
|
else if (::strcmp(key, "FileLevel") == 0)
|
||||||
|
m_logFileLevel = (unsigned int)::atoi(value);
|
||||||
|
else if (::strcmp(key, "DisplayLevel") == 0)
|
||||||
|
m_logDisplayLevel = (unsigned int)::atoi(value);
|
||||||
|
} else if (section == SECTION_NETWORK) {
|
||||||
|
if (::strcmp(key, "Port") == 0)
|
||||||
|
m_networkPort = (unsigned int)::atoi(value);
|
||||||
|
else if (::strcmp(key, "Debug") == 0)
|
||||||
|
m_networkDebug = ::atoi(value) == 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
::fclose(fp);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CConf::getDaemon() const
|
||||||
|
{
|
||||||
|
return m_daemon;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string CConf::getName() const
|
||||||
|
{
|
||||||
|
return m_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string CConf::getDescription() const
|
||||||
|
{
|
||||||
|
return m_description;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int CConf::getLogDisplayLevel() const
|
||||||
|
{
|
||||||
|
return m_logDisplayLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int CConf::getLogFileLevel() const
|
||||||
|
{
|
||||||
|
return m_logFileLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string CConf::getLogFilePath() const
|
||||||
|
{
|
||||||
|
return m_logFilePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string CConf::getLogFileRoot() const
|
||||||
|
{
|
||||||
|
return m_logFileRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int CConf::getNetworkPort() const
|
||||||
|
{
|
||||||
|
return m_networkPort;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CConf::getNetworkDebug() const
|
||||||
|
{
|
||||||
|
return m_networkDebug;
|
||||||
|
}
|
||||||
@ -0,0 +1,66 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(CONF_H)
|
||||||
|
#define CONF_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
class CConf
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
CConf(const std::string& file);
|
||||||
|
~CConf();
|
||||||
|
|
||||||
|
bool read();
|
||||||
|
|
||||||
|
// The General section
|
||||||
|
bool getDaemon() const;
|
||||||
|
|
||||||
|
// The Info section
|
||||||
|
std::string getName() const;
|
||||||
|
std::string getDescription() const;
|
||||||
|
|
||||||
|
// The Log section
|
||||||
|
unsigned int getLogDisplayLevel() const;
|
||||||
|
unsigned int getLogFileLevel() const;
|
||||||
|
std::string getLogFilePath() const;
|
||||||
|
std::string getLogFileRoot() const;
|
||||||
|
|
||||||
|
// The Network section
|
||||||
|
unsigned int getNetworkPort() const;
|
||||||
|
bool getNetworkDebug() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string m_file;
|
||||||
|
bool m_daemon;
|
||||||
|
|
||||||
|
std::string m_name;
|
||||||
|
std::string m_description;
|
||||||
|
|
||||||
|
unsigned int m_logDisplayLevel;
|
||||||
|
unsigned int m_logFileLevel;
|
||||||
|
std::string m_logFilePath;
|
||||||
|
std::string m_logFileRoot;
|
||||||
|
|
||||||
|
unsigned int m_networkPort;
|
||||||
|
bool m_networkDebug;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,136 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "Log.h"
|
||||||
|
|
||||||
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
#include <Windows.h>
|
||||||
|
#else
|
||||||
|
#include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstdarg>
|
||||||
|
#include <ctime>
|
||||||
|
#include <cassert>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
|
static unsigned int m_fileLevel = 2U;
|
||||||
|
static std::string m_filePath;
|
||||||
|
static std::string m_fileRoot;
|
||||||
|
|
||||||
|
static FILE* m_fpLog = NULL;
|
||||||
|
|
||||||
|
static unsigned int m_displayLevel = 2U;
|
||||||
|
|
||||||
|
static struct tm m_tm;
|
||||||
|
|
||||||
|
static char LEVELS[] = " DMIWEF";
|
||||||
|
|
||||||
|
static bool LogOpen()
|
||||||
|
{
|
||||||
|
if (m_fileLevel == 0U)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
time_t now;
|
||||||
|
::time(&now);
|
||||||
|
|
||||||
|
struct tm* tm = ::gmtime(&now);
|
||||||
|
|
||||||
|
if (tm->tm_mday == m_tm.tm_mday && tm->tm_mon == m_tm.tm_mon && tm->tm_year == m_tm.tm_year) {
|
||||||
|
if (m_fpLog != NULL)
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
if (m_fpLog != NULL)
|
||||||
|
::fclose(m_fpLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
char filename[50U];
|
||||||
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
::sprintf(filename, "%s\\%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
|
||||||
|
#else
|
||||||
|
::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
m_fpLog = ::fopen(filename, "a+t");
|
||||||
|
m_tm = *tm;
|
||||||
|
|
||||||
|
return m_fpLog != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
|
||||||
|
{
|
||||||
|
m_filePath = filePath;
|
||||||
|
m_fileRoot = fileRoot;
|
||||||
|
m_fileLevel = fileLevel;
|
||||||
|
m_displayLevel = displayLevel;
|
||||||
|
return ::LogOpen();
|
||||||
|
}
|
||||||
|
|
||||||
|
void LogFinalise()
|
||||||
|
{
|
||||||
|
if (m_fpLog != NULL)
|
||||||
|
::fclose(m_fpLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Log(unsigned int level, const char* fmt, ...)
|
||||||
|
{
|
||||||
|
assert(fmt != NULL);
|
||||||
|
|
||||||
|
char buffer[300U];
|
||||||
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
SYSTEMTIME st;
|
||||||
|
::GetSystemTime(&st);
|
||||||
|
|
||||||
|
::sprintf(buffer, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
|
||||||
|
#else
|
||||||
|
struct timeval now;
|
||||||
|
::gettimeofday(&now, NULL);
|
||||||
|
|
||||||
|
struct tm* tm = ::gmtime(&now.tv_sec);
|
||||||
|
|
||||||
|
::sprintf(buffer, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
va_list vl;
|
||||||
|
va_start(vl, fmt);
|
||||||
|
|
||||||
|
::vsprintf(buffer + ::strlen(buffer), fmt, vl);
|
||||||
|
|
||||||
|
va_end(vl);
|
||||||
|
|
||||||
|
if (level >= m_fileLevel && m_fileLevel != 0U) {
|
||||||
|
bool ret = ::LogOpen();
|
||||||
|
if (!ret)
|
||||||
|
return;
|
||||||
|
|
||||||
|
::fprintf(m_fpLog, "%s\n", buffer);
|
||||||
|
::fflush(m_fpLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (level >= m_displayLevel && m_displayLevel != 0U) {
|
||||||
|
::fprintf(stdout, "%s\n", buffer);
|
||||||
|
::fflush(stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (level == 6U) { // Fatal
|
||||||
|
::fclose(m_fpLog);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(LOG_H)
|
||||||
|
#define LOG_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#define LogDebug(fmt, ...) Log(1U, fmt, ##__VA_ARGS__)
|
||||||
|
#define LogMessage(fmt, ...) Log(2U, fmt, ##__VA_ARGS__)
|
||||||
|
#define LogInfo(fmt, ...) Log(3U, fmt, ##__VA_ARGS__)
|
||||||
|
#define LogWarning(fmt, ...) Log(4U, fmt, ##__VA_ARGS__)
|
||||||
|
#define LogError(fmt, ...) Log(5U, fmt, ##__VA_ARGS__)
|
||||||
|
#define LogFatal(fmt, ...) Log(6U, fmt, ##__VA_ARGS__)
|
||||||
|
|
||||||
|
extern void Log(unsigned int level, const char* fmt, ...);
|
||||||
|
|
||||||
|
extern bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel);
|
||||||
|
extern void LogFinalise();
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
[General]
|
||||||
|
Daemon=1
|
||||||
|
|
||||||
|
[Info]
|
||||||
|
Name=16 characters max
|
||||||
|
Description=14 characters max
|
||||||
|
|
||||||
|
[Log]
|
||||||
|
# Logging levels, 0=No logging
|
||||||
|
DisplayLevel=1
|
||||||
|
FileLevel=1
|
||||||
|
FilePath=.
|
||||||
|
FileRoot=YSFReflector
|
||||||
|
|
||||||
|
[Network]
|
||||||
|
Port=24000
|
||||||
|
Debug=0
|
||||||
Loading…
Reference in new issue