mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Improve docker entry point script.

Browse source 
Change default port to 6379.
Log data directory path.
This commit is contained in:
Roman Gershman 2022-04-08 08:54:53 +03:00
parent 49781e8daf
commit d2b6907f2d
3 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/server/main_service.cc
View file

@ -37,7 +37,7 @@ extern "C" {
// TODO: to move to absl flags and keep legacy flags only for glog library. // TODO: to move to absl flags and keep legacy flags only for glog library.
// absl flags allow parsing of custom types and allow specifying which flags appear // absl flags allow parsing of custom types and allow specifying which flags appear
// for helpshort. // for helpshort.
DEFINE_uint32(port, 6380, "Redis port"); DEFINE_uint32(port, 6379, "Redis port");
DEFINE_uint32(memcache_port, 0, "Memcached port"); DEFINE_uint32(memcache_port, 0, "Memcached port");
DECLARE_string(requirepass); DECLARE_string(requirepass);
DEFINE_uint64(maxmemory, 0, "Limit on maximum-memory that is used by the database"); DEFINE_uint64(maxmemory, 0, "Limit on maximum-memory that is used by the database");
@ -997,18 +997,20 @@ void Service::RegisterCommands() {
server_family_.Register(&registry_); server_family_.Register(&registry_);
LOG(INFO) << "Multi-key commands are: ";
registry_.Traverse([](std::string_view key, const CI& cid) { if (VLOG_IS_ON(1)) {
if (cid.is_multi_key()) { LOG(INFO) << "Multi-key commands are: ";
string key_len; registry_.Traverse([](std::string_view key, const CI& cid) {
if (cid.last_key_pos() < 0) if (cid.is_multi_key()) {
key_len = "unlimited"; string key_len;
else if (cid.last_key_pos() < 0)
key_len = absl::StrCat(cid.last_key_pos() - cid.first_key_pos() + 1); key_len = "unlimited";
LOG(INFO) << " " << key << ": with " << key_len << " keys"; else
} key_len = absl::StrCat(cid.last_key_pos() - cid.first_key_pos() + 1);
}); LOG(INFO) << " " << key << ": with " << key_len << " keys";
}
});
}
} }
} // namespace dfly } // namespace dfly

12
src/server/server_family.cc
View file

@ -103,6 +103,18 @@ void ServerFamily::Init(util::AcceptServer* acceptor) {
}; };
task_10ms_ = pb_task_->AwaitBrief([&] { return pb_task_->AddPeriodic(10, cache_cb); }); task_10ms_ = pb_task_->AwaitBrief([&] { return pb_task_->AddPeriodic(10, cache_cb); });
fs::path data_path = fs::current_path();
if (!FLAGS_dir.empty()) {
data_path = FLAGS_dir;
error_code ec;
data_path = fs::canonical(data_path, ec);
}
LOG(INFO) << "Data directory is " << data_path;
} }
void ServerFamily::Shutdown() { void ServerFamily::Shutdown() {

5
tools/docker/entrypoint.sh
View file

@ -2,9 +2,10 @@
set -e set -e
# first arg is `--some-option` # first arg is `-some-option`
if [ "${1#-}" != "$1" ]; then if [ "${1#-}" != "$1" ]; then
set -- dragonfly "$@" # override arguments by prepending "dragonfly --logtostderr" to them.
set -- dragonfly --logtostderr "$@"
fi fi
# allow the docker container to be started with `--user` # allow the docker container to be started with `--user`