Commit ad474e95 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

log: Remove configurable log facility 



Always use "Local7" internally. We want the log API
to be generic instead of syslog specific.

Change-Id: I021f719e90c236f123fa1cadebc0c199b87ba077
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/365295


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent cbe50740

app/iscsi_tgt/iscsi_tgt.c

+1 −6
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ usage(char *executable_name) 
	printf(" -e mask    tracepoint group mask for spdk trace buffers (default 0x0)\n");

	printf(" -m mask    core mask for DPDK\n");

	printf(" -i shared memory ID (optional)\n");

	printf(" -l facility use specific syslog facility (default %s)\n",

	       opts.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK\n");
@@ -103,7 +101,7 @@ main(int argc, char **argv) 
	opts.config_file = SPDK_ISCSI_DEFAULT_CONFIG;

	opts.name = "iscsi";



	while ((ch = getopt(argc, argv, "bc:de:i:l:m:n:p:qs:t:H")) != -1) {

	while ((ch = getopt(argc, argv, "bc:de:i:m:n:p:qs:t:H")) != -1) {

		switch (ch) {

		case 'd':

			opts.enable_coredump = false;
@@ -114,9 +112,6 @@ main(int argc, char **argv) 
		case 'i':

			opts.shm_id = atoi(optarg);

			break;

		case 'l':

			opts.log_facility = optarg;

			break;

		case 't':

			rc = spdk_log_set_trace_flag(optarg);

			if (rc < 0) {

app/nvmf_tgt/nvmf_main.c

+1 −6
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ usage(void) 
	printf(" -e mask    - tracepoint group mask for spdk trace buffers (default 0x0)\n");

	printf(" -m mask    - core mask for DPDK\n");

	printf(" -i shared memory ID (optional)\n");

	printf(" -l facility - use specific syslog facility (default %s)\n",

	       opts.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK\n");
@@ -82,7 +80,7 @@ main(int argc, char **argv) 
	opts.config_file = SPDK_NVMF_DEFAULT_CONFIG;

	opts.max_delay_us = 1000; /* 1 ms */



	while ((ch = getopt(argc, argv, "c:de:i:l:m:n:p:qs:t:DH")) != -1) {

	while ((ch = getopt(argc, argv, "c:de:i:m:n:p:qs:t:DH")) != -1) {

		switch (ch) {

		case 'd':

			opts.enable_coredump = false;
@@ -93,9 +91,6 @@ main(int argc, char **argv) 
		case 'i':

			opts.shm_id = atoi(optarg);

			break;

		case 'l':

			opts.log_facility = optarg;

			break;

		case 't':

			rc = spdk_log_set_trace_flag(optarg);

			if (rc < 0) {

app/vhost/vhost.c

+1 −5
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ usage(char *executable_name) 
	printf(" -c config  config file (default: %s)\n", defaults.config_file);

	printf(" -e mask    tracepoint group mask for spdk trace buffers (default: 0x0)\n");

	printf(" -m mask    reactor core mask (default: 0x1)\n");

	printf(" -l facility use specific syslog facility (default: %s)\n", defaults.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK (default: %dMB)\n", defaults.mem_size);
@@ -87,7 +86,7 @@ main(int argc, char *argv[]) 


	vhost_app_opts_init(&opts);



	while ((ch = getopt(argc, argv, "c:de:l:m:p:qs:S:t:h")) != -1) {

	while ((ch = getopt(argc, argv, "c:de:m:p:qs:S:t:h")) != -1) {

		switch (ch) {

		case 'c':

			opts.config_file = optarg;
@@ -101,9 +100,6 @@ main(int argc, char *argv[]) 
		case 'h':

			usage(argv[0]);

			exit(EXIT_SUCCESS);

		case 'l':

			opts.log_facility = optarg;

			break;

		case 'm':

			opts.reactor_mask = optarg;

			break;

etc/spdk/iscsi.conf.in

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.

  #TpointGroupMask 0x0



  # syslog facility

  LogFacility "local7"



[iSCSI]

  # node name (not include optional part)

  # Users can optionally change this to fit their environment.

etc/spdk/nvmf.conf.in

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.

  #TpointGroupMask 0x0



  # syslog facility

  LogFacility "local7"



[Rpc]

  # Defines whether to enable configuration via RPC.

  # Default is disabled.  Note that the RPC interface is not