mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-10-12 11:43:13 -04:00
Isaac Connor
88591b4168
With ZM_LOG_DEBUG off, Logger::initialise() clamped every target level (file, database, syslog, terminal) to INFO as well as the overall level. SIGUSR1 raises the overall level, but the effective level is the lower of that and the highest target level, so it stayed at INFO and the signal did nothing. Only cap the overall level. Targets keep their configured levels, so SIGUSR1 behaves as if ZM_LOG_DEBUG_LEVEL had been incremented: targets configured for debug start receiving it, targets at INFO stay at INFO. Startup behaviour is unchanged since the effective level is still INFO. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit af970628c3fe5fe76d163a30747cf534babbb8a6)
127 lines
4.1 KiB
C++
127 lines
4.1 KiB
C++
/*
|
|
* This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
|
|
*
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "zm_catch2.h"
|
|
|
|
#include "zm_logger.h"
|
|
#include "zm_utils.h"
|
|
|
|
#include <csignal>
|
|
#include <cstdio>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <cstdlib>
|
|
#include <unistd.h>
|
|
|
|
static std::string slurp(const std::string &path) {
|
|
std::ifstream in(path);
|
|
std::stringstream ss;
|
|
ss << in.rdbuf();
|
|
return ss.str();
|
|
}
|
|
|
|
// logrotate renames the file and expects the daemon to let go of the old
|
|
// handle. SIGHUP does that but also means reload, which costs zmc a camera
|
|
// reconnect - see issue #5063 - so SIGWINCH is what logrotate reaches for.
|
|
TEST_CASE("SIGWINCH reopens the log file after rotation") {
|
|
std::string path = stringtf("/tmp/zm_test_logrot_%d.log", getpid());
|
|
std::string rotated = path + ".1";
|
|
unlink(path.c_str());
|
|
unlink(rotated.c_str());
|
|
|
|
setenv("LOG_FLUSH", "1", 1);
|
|
Logger::Options options(Logger::NOLOG, Logger::NOLOG, Logger::INFO, Logger::NOLOG);
|
|
options.mLogFile = path;
|
|
logInit("zm_test_logrot", options);
|
|
|
|
Info("before rotation");
|
|
REQUIRE(rename(path.c_str(), rotated.c_str()) == 0);
|
|
Info("still holding the old handle");
|
|
|
|
REQUIRE(slurp(rotated).find("still holding the old handle") != std::string::npos);
|
|
REQUIRE(slurp(path).empty());
|
|
|
|
raise(SIGWINCH);
|
|
Info("after rotation");
|
|
|
|
REQUIRE(slurp(path).find("after rotation") != std::string::npos);
|
|
REQUIRE(slurp(rotated).find("after rotation") == std::string::npos);
|
|
|
|
logTerm();
|
|
unlink(path.c_str());
|
|
unlink(rotated.c_str());
|
|
}
|
|
|
|
// Without ZM_LOG_DEBUG the overall level is capped at INFO, but each target
|
|
// keeps its configured level. SIGUSR1 raises the overall level, as if
|
|
// ZM_LOG_DEBUG_LEVEL had been bumped, so debug reaches the targets configured
|
|
// for it. It used to clamp every target to INFO too, so SIGUSR1 did nothing.
|
|
TEST_CASE("SIGUSR1 turns on debug logging for targets configured for debug") {
|
|
std::string path = stringtf("/tmp/zm_test_logusr1_%d.log", getpid());
|
|
unlink(path.c_str());
|
|
|
|
setenv("LOG_FLUSH", "1", 1);
|
|
Logger::Options options(Logger::NOLOG, Logger::NOLOG, Logger::DEBUG9, Logger::NOLOG);
|
|
options.mLogFile = path;
|
|
logInit("zm_test_logusr1", options);
|
|
|
|
Debug(1, "debug before signal");
|
|
REQUIRE(slurp(path).find("debug before signal") == std::string::npos);
|
|
|
|
raise(SIGUSR1);
|
|
Debug(1, "debug after signal");
|
|
Debug(2, "too verbose for one signal");
|
|
|
|
std::string contents = slurp(path);
|
|
REQUIRE(contents.find("debug after signal") != std::string::npos);
|
|
REQUIRE(contents.find("too verbose for one signal") == std::string::npos);
|
|
|
|
raise(SIGUSR2);
|
|
Debug(1, "debug after lowering");
|
|
Info("info after lowering");
|
|
|
|
contents = slurp(path);
|
|
REQUIRE(contents.find("debug after lowering") == std::string::npos);
|
|
REQUIRE(contents.find("info after lowering") != std::string::npos);
|
|
|
|
logTerm();
|
|
unlink(path.c_str());
|
|
}
|
|
|
|
TEST_CASE("SIGUSR1 leaves targets configured for INFO at INFO") {
|
|
std::string path = stringtf("/tmp/zm_test_logusr1_info_%d.log", getpid());
|
|
unlink(path.c_str());
|
|
|
|
setenv("LOG_FLUSH", "1", 1);
|
|
Logger::Options options(Logger::NOLOG, Logger::NOLOG, Logger::INFO, Logger::NOLOG);
|
|
options.mLogFile = path;
|
|
logInit("zm_test_logusr1_info", options);
|
|
|
|
raise(SIGUSR1);
|
|
Debug(1, "debug after signal");
|
|
Info("info after signal");
|
|
|
|
std::string contents = slurp(path);
|
|
REQUIRE(contents.find("debug after signal") == std::string::npos);
|
|
REQUIRE(contents.find("info after signal") != std::string::npos);
|
|
|
|
raise(SIGUSR2);
|
|
logTerm();
|
|
unlink(path.c_str());
|
|
}
|