properly queue FNE peer messages (these are distinct from peers connected *to* the FNE, FNE peer messages are messages sent to FNE masters that are "ISSI"ed); better handle logging activity logging;
Bryan Biedenkapp
2 years ago
parent
c60b69b54e
commit
abbe6cd41c
@ -0,0 +1,161 @@
|
||||
/**
|
||||
* Digital Voice Modem - Conference FNE Software
|
||||
* GPLv2 Open Source. Use is subject to license terms.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* @package DVM / Conference FNE Software
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Copyright (C) 2024 by Bryan Biedenkapp N2PLL
|
||||
*
|
||||
* 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 "ActivityLog.h"
|
||||
#include "common/network/BaseNetwork.h"
|
||||
#include "common/Log.h" // for CurrentLogFileLevel() and LogGetNetwork()
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
#if defined(CATCH2_TEST_COMPILATION)
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
#endif
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstdarg>
|
||||
#include <ctime>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Constants
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#define EOL "\r\n"
|
||||
|
||||
const uint32_t ACT_LOG_BUFFER_LEN = 501U;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Global Variables
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
static std::string m_actFilePath;
|
||||
static std::string m_actFileRoot;
|
||||
|
||||
static FILE* m_actFpLog = nullptr;
|
||||
|
||||
static struct tm m_actTm;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Global Functions
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// <summary>
|
||||
/// Helper to open the activity log file, file handle.
|
||||
/// </summary>
|
||||
/// <returns>True, if log file is opened, otherwise false.
|
||||
static bool ActivityLogOpen()
|
||||
{
|
||||
if (CurrentLogFileLevel() == 0U)
|
||||
return true;
|
||||
|
||||
time_t now;
|
||||
::time(&now);
|
||||
|
||||
struct tm* tm = ::gmtime(&now);
|
||||
|
||||
if (tm->tm_mday == m_actTm.tm_mday && tm->tm_mon == m_actTm.tm_mon && tm->tm_year == m_actTm.tm_year) {
|
||||
if (m_actFpLog != nullptr)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
if (m_actFpLog != nullptr)
|
||||
::fclose(m_actFpLog);
|
||||
}
|
||||
|
||||
char filename[200U];
|
||||
::sprintf(filename, "%s/%s-%04d-%02d-%02d.activity.log", LogGetFilePath().c_str(), LogGetFileRoot().c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
|
||||
|
||||
m_actFpLog = ::fopen(filename, "a+t");
|
||||
m_actTm = *tm;
|
||||
|
||||
return m_actFpLog != nullptr;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes the activity log.
|
||||
/// </summary>
|
||||
/// <param name="filePath">Full-path to the activity log file.</param>
|
||||
/// <param name="fileRoot">Prefix of the activity log file name.</param>
|
||||
bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot)
|
||||
{
|
||||
#if defined(CATCH2_TEST_COMPILATION)
|
||||
return true;
|
||||
#endif
|
||||
m_actFilePath = filePath;
|
||||
m_actFileRoot = fileRoot;
|
||||
|
||||
return ::ActivityLogOpen();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Finalizes the activity log.
|
||||
/// </summary>
|
||||
void ActivityLogFinalise()
|
||||
{
|
||||
#if defined(CATCH2_TEST_COMPILATION)
|
||||
return;
|
||||
#endif
|
||||
if (m_actFpLog != nullptr)
|
||||
::fclose(m_actFpLog);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Writes a new entry to the activity log.
|
||||
/// </summary>
|
||||
/// <remarks>This is a variable argument function.</remarks>
|
||||
/// <param name="msg">Formatted string to write to activity log.</param>
|
||||
void ActivityLog(const char* msg, ...)
|
||||
{
|
||||
#if defined(CATCH2_TEST_COMPILATION)
|
||||
return;
|
||||
#endif
|
||||
assert(msg != nullptr);
|
||||
|
||||
char buffer[ACT_LOG_BUFFER_LEN];
|
||||
|
||||
va_list vl;
|
||||
va_start(vl, msg);
|
||||
|
||||
::vsnprintf(buffer, ACT_LOG_BUFFER_LEN - 1U, msg, vl);
|
||||
|
||||
va_end(vl);
|
||||
|
||||
bool ret = ::ActivityLogOpen();
|
||||
if (!ret)
|
||||
return;
|
||||
|
||||
if (CurrentLogFileLevel() == 0U)
|
||||
return;
|
||||
|
||||
::fprintf(m_actFpLog, "%s\n", buffer);
|
||||
::fflush(m_actFpLog);
|
||||
|
||||
if (2U >= g_logDisplayLevel && g_logDisplayLevel != 0U) {
|
||||
::fprintf(stdout, "%s" EOL, buffer);
|
||||
::fflush(stdout);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
/**
|
||||
* Digital Voice Modem - Conference FNE Software
|
||||
* GPLv2 Open Source. Use is subject to license terms.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* @package DVM / Conference FNE Software
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Copyright (C) 2024 by Bryan Biedenkapp N2PLL
|
||||
*
|
||||
* 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(__ACTIVITY_LOG_H__)
|
||||
#define __ACTIVITY_LOG_H__
|
||||
|
||||
#include "Defines.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Global Functions
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// <summary>Initializes the activity log.</summary>
|
||||
extern HOST_SW_API bool ActivityLogInitialise(const std::string& filePath, const std::string& fileRoot);
|
||||
/// <summary>Finalizes the activity log.</summary>
|
||||
extern HOST_SW_API void ActivityLogFinalise();
|
||||
/// <summary>Writes a new entry to the activity log.</summary>
|
||||
extern HOST_SW_API void ActivityLog(const char* msg, ...);
|
||||
|
||||
#endif // __ACTIVITY_LOG_H__
|
||||
Loading…
Reference in new issue