---
src/imm/README | 9 ++++++---
src/imm/immloadd/imm_loader.cc | 2 +-
src/imm/immnd/immnd.conf | 2 +-
src/imm/immpbed/immpbe.cc | 2 +-
src/imm/tools/imm_dumper.cc | 2 +-
src/ntf/README | 7 +++++--
src/ntf/ntfd/ntfd.conf | 2 +-
src/ntf/ntfimcnd/ntfimcn_main.c | 2 +-
8 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/imm/README b/src/imm/README
index ee5f8e8..750d811 100644
--- a/src/imm/README
+++ b/src/imm/README
@@ -3206,12 +3206,12 @@ in immd.conf/immnd.conf and restart the cluster.
Errors, warnings and notice level messages are logged to the syslog.
-To enable traces in the IMM library, export the variable IMMA_TRACE_FILENAME
+To enable traces in the IMM library, export the variable IMMA_TRACE_PATHNAME
with a valid pathname before starting the application using the IMM library.
For example:
-$ export IMMA_TRACE_FILENAME=imm.trace
+$ export IMMA_TRACE_PATHNAME=imm.trace
$ ./immomtest
$ cat $pkglogdir/imm.trace
@@ -3220,8 +3220,11 @@ It is also possible to trace slave processes forked by the IMMND.
This would be processes for loading, sync and dump/pbe.
To enable such trace uncomment:
-#export IMMSV_TRACE_FILENAME=osafimmnd
+#export IMMSV_TRACE_PATHNAME=osafimmnd
+It is recommended to use osaflog command as it takes care of flushing
+unwritten trace messages from memory to disk, as well as concatenating
+the pieces that may have resulted from log rotation of the trace stream.
TEST
diff --git a/src/imm/immloadd/imm_loader.cc b/src/imm/immloadd/imm_loader.cc
index 13fb417..de5a575 100644
--- a/src/imm/immloadd/imm_loader.cc
+++ b/src/imm/immloadd/imm_loader.cc
@@ -2507,7 +2507,7 @@ int main(int argc, char *argv[]) {
exit(1);
}
- if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
+ if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
category_mask = 0xffffffff; /* TODO: set using env variable ? */
} else {
logPath = defaultLog;
diff --git a/src/imm/immnd/immnd.conf b/src/imm/immnd/immnd.conf
index 9172677..b6a4823 100644
--- a/src/imm/immnd/immnd.conf
+++ b/src/imm/immnd/immnd.conf
@@ -12,7 +12,7 @@
# they attach as IMMA clients. These processes will also route trace to the
# IMMND trace-file as define here. Traces are always stored in $PKGLOGDIR
# directory and the directory component of the path name (if any) is ignored.
-#export IMMSV_TRACE_FILENAME=osafimmnd
+#export IMMSV_TRACE_PATHNAME=osafimmnd
# The directory where the imm.xml files and persistend backend files are
# stored. Imm dump files may also be stored here or in a subdirectory.
diff --git a/src/imm/immpbed/immpbe.cc b/src/imm/immpbed/immpbe.cc
index 6e9b933..964086f 100644
--- a/src/imm/immpbed/immpbe.cc
+++ b/src/imm/immpbed/immpbe.cc
@@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
const SaImmAdminOperationParamsT_2* params[] = {NULL};
SaImmAdminOperationParamsT_2** retParams = NULL;
- if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
+ if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
category_mask = 0xffffffff; /* TODO: set using -t flag ? */
} else {
logPath = defaultLog;
diff --git a/src/imm/tools/imm_dumper.cc b/src/imm/tools/imm_dumper.cc
index 5e5dd00..0365fc7 100644
--- a/src/imm/tools/imm_dumper.cc
+++ b/src/imm/tools/imm_dumper.cc
@@ -123,7 +123,7 @@ int main(int argc, char* argv[]) {
* osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize */
osaf_extended_name_init();
- if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
+ if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
category_mask = 0xffffffff; /* TODO: set using -t flag ? */
} else {
logPath = defaultLog;
diff --git a/src/ntf/README b/src/ntf/README
index ce78b10..6dd5173 100644
--- a/src/ntf/README
+++ b/src/ntf/README
@@ -260,17 +260,20 @@ in ntfd.conf (see CONFIGURATION above) and restart the
cluster.
For fatal errors syslog is used.
-To enable traces in the NTF library, export the variable NTFSV_TRACE_FILENAME
+To enable traces in the NTF library, export the variable NTFSV_TRACE_PATHNAME
with a valid filename before starting the application using the NTF library.
Traces are always stored in $PKGLOGDIR directory and the directory component
of the path name (if any) is ignored.
For example:
-$ export NTFSV_TRACE_FILENAME=ntf.trace
+$ export NTFSV_TRACE_PATHNAME=ntf.trace
$ ntfsend
$ cat $pkglogdir/ntf.trace
+It is recommended to use osaflog command as it takes care of flushing
+unwritten trace messages from memory to disk, as well as concatenating
+the pieces that may have resulted from log rotation of the trace stream.
TEST
diff --git a/src/ntf/ntfd/ntfd.conf b/src/ntf/ntfd/ntfd.conf
index 07d90d5..56bb3d3 100644
--- a/src/ntf/ntfd/ntfd.conf
+++ b/src/ntf/ntfd/ntfd.conf
@@ -22,4 +22,4 @@ export NTFSV_ENV_HEALTHCHECK_KEY="Default"
# The process will also route trace to the NTF trace-file as define here.
# Traces are always stored in $PKGLOGDIR
# directory and the directory component of the path name (if any) is ignored.
-#export NTFSCN_TRACE_FILENAME=osafntfcn
+#export NTFSCN_TRACE_PATHNAME=osafntfcn
diff --git a/src/ntf/ntfimcnd/ntfimcn_main.c b/src/ntf/ntfimcnd/ntfimcn_main.c
index 61a0167..51be3dc 100644
--- a/src/ntf/ntfimcnd/ntfimcn_main.c
+++ b/src/ntf/ntfimcnd/ntfimcn_main.c
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
* Activate Log Trace
*/
openlog(basename(argv[0]), LOG_PID, LOG_LOCAL0);
- if ((logPath = getenv("NTFSCN_TRACE_FILENAME"))) {
+ if ((logPath = getenv("NTFSCN_TRACE_PATHNAME"))) {
category_mask = 0xffffffff;
} else {
logPath = NTFIMCN_DEFAULT_LOG;
