Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove the dfly logo print from pytest run #4682 #4706

Merged
merged 4 commits into from
Mar 6, 2025
Merged

fix: Remove the dfly logo print from pytest run #4682 #4706

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd10a34
fix: new flag was added in command line to skip printing basic usage …
vyavdoshenko Mar 5, 2025
11633bc
fix: --skip_basic_usage flag was added to pytest execution
vyavdoshenko Mar 5, 2025
3735829
fix: skip the new flag for older version of dragonfly
vyavdoshenko Mar 5, 2025
96f8a9a
fix: review suggestions have been applied
vyavdoshenko Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/server/dfly_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ ABSL_FLAG(uint16_t, uring_recv_buffer_cnt, 0,
"How many socket recv buffers of size 256 to allocate per thread."
"Relevant only for modern kernels with io_uring enabled");

ABSL_FLAG(bool, skip_basic_usage, false, "Skip printing basic usage info.");

using namespace util;
using namespace facade;
using namespace io;
Expand Down Expand Up @@ -740,7 +742,10 @@ Usage: dragonfly [FLAGS]

ParseFlagsFromEnv();

PrintBasicUsageInfo();
if (!GetFlag(FLAGS_skip_basic_usage)) {
PrintBasicUsageInfo();
}

LOG(INFO) << "Starting dragonfly " << GetVersion() << "-" << kGitSha;

struct sigaction act;
Expand Down
1 change: 1 addition & 0 deletions tests/dragonfly/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ def create(self, existing_port=None, path=None, version=100, **kwargs) -> DflyIn
vmod = "dragonfly_connection=1,accept_server=1,listener_interface=1,main_service=1,rdb_save=1,replica=1,cluster_family=1,proactor_pool=1,dflycmd=1,snapshot=1,streamer=1"
args.setdefault("vmodule", vmod)
args.setdefault("jsonpathv2")
args.setdefault("skip_basic_usage")

# If path is not set, we assume that we are running the latest dragonfly.
if not path:
Expand Down
Loading