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 <dgoulet@efficios.com>

diff --git a/doc/man/lttng-sessiond.8 b/doc/man/lttng-sessiond.8
index 782a9bb18f65ba20707158caf1dbca2aaaaa518b..6fdc4830286edd3e85757de9360fc1e19fd8cdf4 100644 (file)
--- 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 61ddf905cc37f716393a0b3e7a148456fcd2025e..fac06e0f75c62512e67ea2e87f2b469a5b2a1d90 100644 (file)
--- 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 1aecb30e5577c6802f3f55ed3f250d218165e9c4..1beb516aa09980fd39c750cda2b70df2efef96e2 100644 (file)
--- 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 */