chore: tune logs and improve restrict denied error (#4145)

1. Now error stats show "restrict_denied" instead of "Cannot execute restricted command ..." error. 2. Increased verbosity level when loading a key with expired timestamp. 3. pulled helio with better logs coverage of tls_socket.cc code. Signed-off-by: Roman Gershman <[email protected]>
dragonflydb · Nov 18, 2024 · 794bd1c · 794bd1c
1 parent 907346e
commit 794bd1c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/helio b/helio
diff --git a/src/facade/error.h b/src/facade/error.h
@@ -42,5 +42,6 @@ extern const char kScriptErrType[];
 extern const char kConfigErrType[];
 extern const char kSearchErrType[];
 extern const char kWrongTypeErrType[];
+extern const char kRestrictDenied[];
 
 }  // namespace facade
diff --git a/src/facade/facade.cc b/src/facade/facade.cc
@@ -103,6 +103,7 @@ const char kScriptErrType[] = "script_error";
 const char kConfigErrType[] = "config_error";
 const char kSearchErrType[] = "search_error";
 const char kWrongTypeErrType[] = "wrong_type";
+const char kRestrictDenied[] = "restrict_denied";
 
 const char* RespExpr::TypeName(Type t) {
   switch (t) {

diff --git a/src/server/main_service.cc b/src/server/main_service.cc
@@ -1028,9 +1028,9 @@ std::optional<ErrorReply> Service::VerifyCommandState(const CommandId* cid, CmdA
   // If there is no connection owner, it means the command it being called
   // from another command or used internally, therefore is always permitted.
   if (dfly_cntx.conn() != nullptr && !dfly_cntx.conn()->IsPrivileged() && cid->IsRestricted()) {
-    VLOG(1) << "Non-admin attempt to execute " << cid->name() << " "
+    VLOG(1) << "Non-admin attempt to execute " << cid->name() << " " << tail_args << " "
             << ConnectionLogContext(dfly_cntx.conn());
-    return ErrorReply{"Cannot execute restricted command (admin only)"};
+    return ErrorReply{"Cannot execute restricted command (admin only)", kRestrictDenied};
   }
 
   if (auto err = cid->Validate(tail_args); err)

diff --git a/src/server/rdb_load.cc b/src/server/rdb_load.cc
@@ -2733,7 +2733,7 @@ void RdbLoader::LoadItemsBuffer(DbIndex db_ind, const ItemsBuf& ib) {
     }
 
     if (item->expire_ms > 0 && db_cntx.time_now_ms >= item->expire_ms) {
-      VLOG(1) << "Expire key on load: " << item->key;
+      VLOG(2) << "Expire key on load: " << item->key;
       continue;
     }
+36 −5		base/mpsc_intrusive_queue.h
+1 −1		base/mpsc_intrusive_queue_test.cc
+27 −5		examples/gcs_demo.cc
+3 −1		strings/escaping.cc
+5 −3		util/cloud/azure/azure.cc
+2 −0		util/cloud/azure/creds_provider.h
+134 −2		util/cloud/azure/storage.cc
+12 −0		util/cloud/azure/storage.h
+0 −2		util/fibers/detail/fiber_interface.h
+1 −6		util/fibers/detail/scheduler.cc
+34 −11		util/tls/tls_socket.cc
+3 −2		util/tls/tls_socket.h