diff --git a/core/tarantool.c b/core/tarantool.c index 12efa6df30284255b615c4bc710bb6fe26e90f1a..4d7353a1559c0cde35efe44d313adb843407e3a9 100644 --- a/core/tarantool.c +++ b/core/tarantool.c @@ -389,7 +389,7 @@ main(int argc, char **argv) binary_filename = argv[0]; if (gopt(opt, 'V')) { - puts(tarantool_version()); + printf("Tarantool/%s %s\n", mod_name, tarantool_version()); return 0; } diff --git a/include/tarantool.h b/include/tarantool.h index 2e8d409d0977ae346349f0ad01b4e76b7237d59f..5f5e1af9ad17385d01b09e4f2b0b55142cbb1cf7 100644 --- a/include/tarantool.h +++ b/include/tarantool.h @@ -34,6 +34,8 @@ extern struct recovery_state *recovery_state; void mod_init(void); struct tarantool_cfg; + +extern const char *mod_name; i32 mod_check_config(struct tarantool_cfg *conf); void mod_reload_config(struct tarantool_cfg *old_conf, struct tarantool_cfg *new_conf); int mod_cat(const char *filename); @@ -41,7 +43,6 @@ void mod_snapshot(struct log_io_iter *); void mod_info(struct tbuf *out); void mod_exec(char *str, int len, struct tbuf *out); -extern struct tarantool_module module; extern struct tarantool_cfg cfg; extern struct tbuf *cfg_out; extern const char *cfg_filename; diff --git a/mod/feeder/feeder.c b/mod/feeder/feeder.c index f2c4233e55e3451950ef3f968fedbefc463f08bd..16d31d83351866914ef871e5b648bb8c1a9be127 100644 --- a/mod/feeder/feeder.c +++ b/mod/feeder/feeder.c @@ -32,6 +32,7 @@ #include <util.h> #include "cfg/tarantool_feeder_cfg.h" +const char *mod_name = "Feeder"; static char *custom_proc_title; static int diff --git a/mod/silverbox/box.c b/mod/silverbox/box.c index c4db16a74a55c3ecba20ff1c8a74d955c134aacd..0288c8f6770be9321ae1ed77a0bd9e35fceb82dc 100644 --- a/mod/silverbox/box.c +++ b/mod/silverbox/box.c @@ -45,6 +45,8 @@ #include <mod/silverbox/box.h> #include <mod/silverbox/index.h> +const char *mod_name = "Silverbox"; + bool box_updates_allowed = false; static char *status = "unknown"; diff --git a/test/box/args.result b/test/box/args.result index c6e5528c54766ebb376b1afe5d4aa110bc7b26fe..43290bf08c37839657138c3a9223686bff4d11a1 100644 --- a/test/box/args.result +++ b/test/box/args.result @@ -62,10 +62,10 @@ tarantool_silverbox --daemonize tarantool_silverbox: the daemon is already running tarantool_silverbox --version -1.minor.patch-<rev>-<commit> +Tarantool/Silverbox 1.minor.patch-<rev>-<commit> tarantool_silverbox -V -1.minor.patch-<rev>-<commit> +Tarantool/Silverbox 1.minor.patch-<rev>-<commit> # # A test case for Bug#726778 "Gopt broke wal_dir and snap_dir: they are no