tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8580 from bebehei/typo 

Fix typo seemless -> seamless
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-01-11 13:45:08 +01:00 committed by GitHub
parent 635a8c5d4c 8a455e8150
commit d996d1e201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/shared-object.hpp
View File

@ -16,7 +16,7 @@ inline void intrusive_ptr_add_ref(SharedObject *object);
inline void intrusive_ptr_release(SharedObject *object);
/**
* Seemless and polymorphistic base for any class to create shared pointers of.
* Seamless and polymorphistic base for any class to create shared pointers of.
* Saves a memory allocation compared to std::shared_ptr.
*
* @ingroup base

2
lib/base/shared.hpp
View File

@ -29,7 +29,7 @@ inline void intrusive_ptr_release(Shared<T> *object)
}
/**
* Seemless wrapper for any class to create shared pointers of.
* Seamless wrapper for any class to create shared pointers of.
* Saves a memory allocation compared to std::shared_ptr.
*
* @ingroup base

28
lib/cli/daemoncommand.cpp
View File

@ -304,7 +304,7 @@ int RunWorker(const std::vector<std::string>& configs, bool closeConsoleLog = fa
#ifndef _WIN32
/**
* The possible states of a seemless worker being started by StartUnixWorker().
* The possible states of a seamless worker being started by StartUnixWorker().
*/
enum class UnixWorkerState : uint_fast8_t
{
@ -328,10 +328,10 @@ static const sigset_t l_UnixWorkerSignals = ([]() -> sigset_t {
return s;
})();
// The PID of the seemless worker currently being started by StartUnixWorker()
// The PID of the seamless worker currently being started by StartUnixWorker()
static Atomic<pid_t> l_CurrentlyStartingUnixWorkerPid (-1);
// The state of the seemless worker currently being started by StartUnixWorker()
// The state of the seamless worker currently being started by StartUnixWorker()
static Atomic<UnixWorkerState> l_CurrentlyStartingUnixWorkerState (UnixWorkerState::Pending);
// The last temination signal we received
@ -356,14 +356,14 @@ static void UmbrellaSignalHandler(int num, siginfo_t *info, void*)
case SIGUSR2:
if (l_CurrentlyStartingUnixWorkerState.load() == UnixWorkerState::Pending
&& (info->si_pid == 0 || info->si_pid == l_CurrentlyStartingUnixWorkerPid.load()) ) {
// The seemless worker currently being started by StartUnixWorker() successfully loaded its config
// The seamless worker currently being started by StartUnixWorker() successfully loaded its config
l_CurrentlyStartingUnixWorkerState.store(UnixWorkerState::LoadedConfig);
}
break;
case SIGCHLD:
if (l_CurrentlyStartingUnixWorkerState.load() == UnixWorkerState::Pending
&& (info->si_pid == 0 || info->si_pid == l_CurrentlyStartingUnixWorkerPid.load()) ) {
// The seemless worker currently being started by StartUnixWorker() failed
// The seamless worker currently being started by StartUnixWorker() failed
l_CurrentlyStartingUnixWorkerState.store(UnixWorkerState::Failed);
}
break;
@ -393,7 +393,7 @@ static void UmbrellaSignalHandler(int num, siginfo_t *info, void*)
}
/**
* Seemless worker's signal handlers
* Seamless worker's signal handlers
*/
static void WorkerSignalHandler(int num, siginfo_t *info, void*)
{
@ -440,7 +440,7 @@ static void NotifyWatchdog()
#endif /* HAVE_SYSTEMD */
/**
* Starts seemless worker process doing the actual work (config loading, ...)
* Starts seamless worker process doing the actual work (config loading, ...)
*
* @param configs Files to read config from
* @param closeConsoleLog Whether to close the console log after config loading
@ -451,7 +451,7 @@ static void NotifyWatchdog()
static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool closeConsoleLog = false, const String& stderrFile = String())
{
Log(LogNotice, "cli")
<< "Spawning seemless worker process doing the actual work";
<< "Spawning seamless worker process doing the actual work";
try {
Application::UninitializeBase();
@ -707,7 +707,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
if (vm.count("errorlog"))
errorLog = vm["errorlog"].as<std::string>();
// The PID of the current seemless worker
// The PID of the current seamless worker
pid_t currentWorker = StartUnixWorker(configs, closeConsoleLog, errorLog);
if (currentWorker == -1) {
@ -730,7 +730,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
sd_notify(0, "READY=1");
#endif /* HAVE_SYSTEMD */
// Whether we already forwarded a termination signal to the seemless worker
// Whether we already forwarded a termination signal to the seamless worker
bool requestedTermination = false;
// Whether we already notified systemd about our termination
@ -745,7 +745,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
int termSig = l_TermSignal.load();
if (termSig != -1) {
Log(LogNotice, "cli")
<< "Got signal " << termSig << ", forwarding to seemless worker (PID " << currentWorker << ")";
<< "Got signal " << termSig << ", forwarding to seamless worker (PID " << currentWorker << ")";
(void)kill(currentWorker, termSig);
requestedTermination = true;
@ -804,7 +804,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
if (l_RequestedReopenLogs.exchange(false)) {
Log(LogNotice, "cli")
<< "Got signal " << SIGUSR1 << ", forwarding to seemless worker (PID " << currentWorker << ")";
<< "Got signal " << SIGUSR1 << ", forwarding to seamless worker (PID " << currentWorker << ")";
(void)kill(currentWorker, SIGUSR1);
}
@ -813,7 +813,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
int status;
if (waitpid(currentWorker, &status, WNOHANG) > 0) {
Log(LogNotice, "cli")
<< "Seemless worker (PID " << currentWorker << ") stopped, stopping as well";
<< "Seamless worker (PID " << currentWorker << ") stopped, stopping as well";
#ifdef HAVE_SYSTEMD
if (!notifiedTermination) {
@ -822,7 +822,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
}
#endif /* HAVE_SYSTEMD */
// If killed by signal, forward it via the exit code (to be as seemless as possible)
// If killed by signal, forward it via the exit code (to be as seamless as possible)
return WIFSIGNALED(status) ? 128 + WTERMSIG(status) : WEXITSTATUS(status);
}
}