From 1b2ef7fe9e5d6396484002b5ba20b798b45519f9 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 30 Jul 2014 14:12:09 -0400 Subject: [PATCH] Change --jul-port-tcp and jul.port to use agent namespace They are both renamed to --agent-port-tcp and "agent.port" file. Signed-off-by: David Goulet --- doc/man/lttng-sessiond.8 | 4 ++-- src/bin/lttng-sessiond/main.c | 8 ++++---- src/common/defaults.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/man/lttng-sessiond.8 b/doc/man/lttng-sessiond.8 index 782a9bb18..6fdc48302 100644 --- a/doc/man/lttng-sessiond.8 +++ b/doc/man/lttng-sessiond.8 @@ -78,8 +78,8 @@ No output at all. .BR " --no-kernel" No kernel tracer support .TP -.BR " --jul-tcp-port" -JUL application registration TCP port (default: 5345) +.BR " --agent-tcp-port" +Agent application registration TCP port (default: 5345) .TP .BR " --kmod-probes=probe1, probe2, ..." Specify the kernel modules containing LTTng probes to load by the session daemon. diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index 61ddf905c..fac06e0f7 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -153,7 +153,7 @@ static const struct option long_options[] = { { "verbose-consumer", 0, 0, 'Z' }, { "no-kernel", 0, 0, 'N' }, { "pidfile", 1, 0, 'p' }, - { "jul-tcp-port", 1, 0, 'J' }, + { "agent-tcp-port", 1, 0, 'J' }, { "config", 1, 0, 'f' }, { "load", 1, 0, 'l' }, { "kmod-probes", 1, 0, 'P' }, @@ -4205,7 +4205,7 @@ static void usage(void) fprintf(stderr, " -p, --pidfile FILE Write a pid to FILE name overriding the default value.\n"); fprintf(stderr, " --verbose-consumer Verbose mode for consumer. Activate DBG() macro.\n"); fprintf(stderr, " --no-kernel Disable kernel tracer\n"); - fprintf(stderr, " --jul-tcp-port JUL application registration TCP port\n"); + fprintf(stderr, " --agent-tcp-port Agent registration TCP port\n"); fprintf(stderr, " -f --config Load daemon configuration file\n"); fprintf(stderr, " -l --load PATH Load session configuration\n"); fprintf(stderr, " --kmod-probes Specify kernel module probes to load\n"); @@ -4368,11 +4368,11 @@ static int set_option(int opt, const char *arg, const char *optname) errno = 0; v = strtoul(arg, NULL, 0); if (errno != 0 || !isdigit(arg[0])) { - ERR("Wrong value in --jul-tcp-port parameter: %s", arg); + ERR("Wrong value in --agent-tcp-port parameter: %s", arg); return -1; } if (v == 0 || v >= 65535) { - ERR("Port overflow in --jul-tcp-port parameter: %s", arg); + ERR("Port overflow in --agent-tcp-port parameter: %s", arg); return -1; } agent_tcp_port = (uint32_t) v; diff --git a/src/common/defaults.h b/src/common/defaults.h index 1aecb30e5..1beb516aa 100644 --- a/src/common/defaults.h +++ b/src/common/defaults.h @@ -88,7 +88,7 @@ #define DEFAULT_LTTNG_RUNDIR CONFIG_LTTNG_SYSTEM_RUNDIR #define DEFAULT_LTTNG_HOME_RUNDIR "%s/.lttng" #define DEFAULT_LTTNG_SESSIOND_PIDFILE "lttng-sessiond.pid" -#define DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE "jul.port" +#define DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE "agent.port" #define DEFAULT_LTTNG_SESSIOND_LOCKFILE "lttng-sessiond.lck" /* Default probes list */ -- 2.34.1