diff --git a/helio b/helio index 2ab4412b7..54a854715 160000 --- a/helio +++ b/helio @@ -1 +1 @@ -Subproject commit 2ab4412b78afbf7d3102b472fb0e6f70b194a535 +Subproject commit 54a854715599ec724727ca09171f3b54d0855872 diff --git a/src/server/rdb_test.cc b/src/server/rdb_test.cc index 6a3123578..8d1ad4029 100644 --- a/src/server/rdb_test.cc +++ b/src/server/rdb_test.cc @@ -458,8 +458,8 @@ TEST_F(RdbTest, JsonTest) { class HllRdbTest : public RdbTest, public testing::WithParamInterface {}; TEST_P(HllRdbTest, Hll) { - LOG(INFO) << " max memory: " << max_memory_limit - << " used_mem_current: " << used_mem_current.load(); + LOG(ERROR) << " max memory: " << max_memory_limit + << " used_mem_current: " << used_mem_current.load(); auto ec = LoadRdb("hll.rdb"); ASSERT_FALSE(ec) << ec.message(); diff --git a/tools/packaging/debian/dragonfly.service b/tools/packaging/debian/dragonfly.service index 0bb02994b..593076eb1 100755 --- a/tools/packaging/debian/dragonfly.service +++ b/tools/packaging/debian/dragonfly.service @@ -6,7 +6,7 @@ Documentation= [Service] Type=simple EnvironmentFile=-/etc/dragonfly/environment -ExecStart=/usr/bin/dragonfly --flagfile=/etc/dragonfly/dragonfly.conf +ExecStart=/usr/local/bin/dragonfly --flagfile=/etc/dragonfly/dragonfly.conf PIDFile=/var/run/dragonfly/dragonfly.pid TimeoutStopSec=infinity Restart=always diff --git a/tools/packaging/rpm/dragonfly.spec b/tools/packaging/rpm/dragonfly.spec index 6b6229ee3..0e05e4270 100644 --- a/tools/packaging/rpm/dragonfly.spec +++ b/tools/packaging/rpm/dragonfly.spec @@ -35,6 +35,8 @@ mv ./dragonfly-%{_arch} ./dragonfly %install mkdir -p %{buildroot}/usr/local/bin mkdir -p %{buildroot}/etc/dragonfly +mkdir -p %{buildroot}/var/log/dragonfly +mkdir -p %{buildroot}/var/lib/dragonfly install -m 755 ./dragonfly %{buildroot}/usr/local/bin/ mkdir -p %{buildroot}/usr/lib/systemd/system