thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8616 from ClickHouse/weiqxu-master

Browse Source 
Merging #8487
This commit is contained in:
alexey-milovidov 2020-01-11 12:40:55 +03:00 committed by GitHub
commit 098039191c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/libdaemon/include/daemon/BaseDaemon.h
View File

@ -168,22 +168,11 @@ protected:
{
std::string file;
/// Создать объект, не создавая PID файл
PID() {}
/// Создать объект, создать PID файл
PID(const std::string & file_) { seed(file_); }
/// Создать PID файл
void seed(const std::string & file_);
/// Удалить PID файл
void clear();
~PID() { clear(); }
PID(const std::string & file_);
~PID();
};
PID pid;
std::optional<PID> pid;
std::atomic_bool is_cancelled{false};

37
libs/libdaemon/src/BaseDaemon.cpp
View File

@ -18,6 +18,7 @@
#include <fstream>
#include <sstream>
#include <memory>
#include <ext/scope_guard.h>
#include <Poco/Observer.h>
#include <Poco/AutoPtr.h>
@ -498,7 +499,7 @@ void BaseDaemon::terminate()
void BaseDaemon::kill()
{
dumpCoverageReportIfPossible();
pid.clear();
pid.reset();
if (::raise(SIGKILL) != 0)
throw Poco::SystemException("cannot kill process");
}
@ -668,7 +669,7 @@ void BaseDaemon::initialize(Application & self)
/// Create pid file.
if (config().has("pid"))
pid.seed(config().getString("pid"));
pid.emplace(config().getString("pid"));
/// Change path for logging.
if (!log_path.empty())
@ -835,7 +836,7 @@ bool isPidRunning(pid_t pid)
return 0;
}
void BaseDaemon::PID::seed(const std::string & file_)
BaseDaemon::PID::PID(const std::string & file_)
{
file = Poco::Path(file_).absolute().toString();
Poco::File poco_file(file);
@ -862,34 +863,28 @@ void BaseDaemon::PID::seed(const std::string & file_)
if (-1 == fd)
{
file.clear();
if (EEXIST == errno)
throw Poco::Exception("Pid file exists, should not start daemon.");
throw Poco::CreateFileException("Cannot create pid file.");
}
SCOPE_EXIT({ close(fd); });
std::stringstream s;
s << getpid();
if (static_cast<ssize_t>(s.str().size()) != write(fd, s.str().c_str(), s.str().size()))
throw Poco::Exception("Cannot write to pid file.");
}
BaseDaemon::PID::~PID()
{
try
{
std::stringstream s;
s << getpid();
if (static_cast<ssize_t>(s.str().size()) != write(fd, s.str().c_str(), s.str().size()))
throw Poco::Exception("Cannot write to pid file.");
Poco::File(file).remove();
}
catch (...)
{
close(fd);
throw;
}
close(fd);
}
void BaseDaemon::PID::clear()
{
if (!file.empty())
{
Poco::File(file).remove();
file.clear();
DB::tryLogCurrentException(__PRETTY_FUNCTION__);
}
}