From 8a455e8150fe76ab18f9e36e2409f7bd5582ebc4 Mon Sep 17 00:00:00 2001 From: Benedikt Heine Date: Fri, 25 Dec 2020 23:27:08 +0100 Subject: [PATCH] Fix typo seemless -> seamless --- lib/base/shared-object.hpp | 2 +- lib/base/shared.hpp | 2 +- lib/cli/daemoncommand.cpp | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/base/shared-object.hpp b/lib/base/shared-object.hpp index a8974acff..58636dccb 100644 --- a/lib/base/shared-object.hpp +++ b/lib/base/shared-object.hpp @@ -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 diff --git a/lib/base/shared.hpp b/lib/base/shared.hpp index 33e0bcfc3..63b35cb2f 100644 --- a/lib/base/shared.hpp +++ b/lib/base/shared.hpp @@ -29,7 +29,7 @@ inline void intrusive_ptr_release(Shared *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 diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp index 784ffa4d2..c6b2f4aed 100644 --- a/lib/cli/daemoncommand.cpp +++ b/lib/cli/daemoncommand.cpp @@ -304,7 +304,7 @@ int RunWorker(const std::vector& 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 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 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& 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(); - // 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 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) { @@ -833,7 +833,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector