hawkeye 2005/01/05 12:20:21
Modified: c/src/common AxisConfig.cpp AxisConfig.h AxisTrace.cpp
Log:
Moved config file information from "DEBUG" into trace. Debug info will now
only appear when trace is on.
Revision Changes Path
1.59 +2 -97 ws-axis/c/src/common/AxisConfig.cpp
Index: AxisConfig.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- AxisConfig.cpp 25 Nov 2004 12:41:56 -0000 1.58
+++ AxisConfig.cpp 5 Jan 2005 20:20:21 -0000 1.59
@@ -94,15 +94,9 @@
if (AXIS_SUCCESS != fileConfig.fileOpen (sNewConfPath, "r"))
{
-
-#ifdef _DEBUG
- printf("Warning - The configuration file was not found
(%s).\n", sNewConfPath);
- printf(" Using the following default file paths.\n");
- OutputConfigInfo ();
-#else
printf ("Warning - The configuration file was not found
(%s).\n",
sNewConfPath);
-#endif
+ printf("Using default values\n");
return AXIS_SUCCESS;
}
@@ -160,11 +154,6 @@
}
-#ifdef _DEBUG
- printf ("The AXIS configuration has now been set to:-\n");
-
- OutputConfigInfo ();
-#endif
return AXIS_SUCCESS;
}
@@ -198,90 +187,6 @@
*/
-void
-AxisConfig::OutputConfigInfo ()
-{
- if (m_pcValueArray[AXCONF_WSDDFILEPATH].length() == 0)
- {
- printf ("WSDD (null)\n");
- }
- else
- {
- printf ("WSDD %s\n",
m_pcValueArray[AXCONF_WSDDFILEPATH].c_str());
- }
- if (m_pcValueArray[AXCONF_LOGPATH].length() == 0)
- {
- printf ("Log (null)\n");
- }
- else
- {
- printf ("Log %s\n", m_pcValueArray[AXCONF_LOGPATH].c_str());
- }
- if (m_pcValueArray[AXCONF_CLIENTLOGPATH].length() == 0)
- {
- printf ("Client Log (null)\n");
- }
- else
- {
- printf ("Client Log %s\n",
m_pcValueArray[AXCONF_CLIENTLOGPATH].c_str());
- }
- if (m_pcValueArray[AXCONF_CLIENTWSDDFILEPATH].length() == 0)
- {
- printf ("ClientWSDD (null)\n");
- }
- else
- {
- printf ("ClientWSDD %s\n",
- m_pcValueArray[AXCONF_CLIENTWSDDFILEPATH].c_str());
- }
- if (m_pcValueArray[AXCONF_AXISHOME].length() == 0)
- {
- printf ("AXIS HOME (null)\n");
- }
- else
- {
- printf ("AXIS HOME %s\n", m_pcValueArray[AXCONF_AXISHOME].c_str());
- }
- if (m_pcValueArray[AXCONF_TRANSPORTHTTP].length() == 0)
- {
- printf ("Transport HTTP (null)\n");
- }
- else
- {
- printf ("Transport HTTP %s\n",
m_pcValueArray[AXCONF_TRANSPORTHTTP].c_str());
- }
- if (m_pcValueArray[AXCONF_TRANSPORTSMTP].length() == 0)
- {
- printf ("Transport SMTP (null)\n");
- }
- else
- {
- printf ("Transport SMTP %s\n",
m_pcValueArray[AXCONF_TRANSPORTSMTP].c_str());
- }
- if (m_pcValueArray[AXCONF_XMLPARSER].length() == 0)
- {
- printf ("XML Parser (null)\n");
- }
- else
- {
- printf ("XML Parser %s\n",
m_pcValueArray[AXCONF_XMLPARSER].c_str());
- }
- if (m_pcValueArray[AXCONF_NODENAME].length() == 0)
- {
- printf ("Node Name (null)\n");
- }
- else
- {
- printf ("Node Name %s\n", m_pcValueArray[AXCONF_NODENAME].c_str());
- }
- if (m_pcValueArray[AXCONF_LISTENPORT].length() == 0)
- {
- printf ("Listen Port (null)\n");
- }
- else
- {
- printf ("Listen Port %s\n",
m_pcValueArray[AXCONF_LISTENPORT].c_str());
- }
-}
+
AXIS_CPP_NAMESPACE_END
1.17 +0 -2 ws-axis/c/src/common/AxisConfig.h
Index: AxisConfig.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AxisConfig.h 25 Nov 2004 12:41:56 -0000 1.16
+++ AxisConfig.h 5 Jan 2005 20:20:21 -0000 1.17
@@ -89,8 +89,6 @@
void setValue(int valuelength, g_axconfig valueindex, char*
value);
- void OutputConfigInfo();
-
};
AXIS_CPP_NAMESPACE_END
1.48 +48 -3 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- AxisTrace.cpp 17 Dec 2004 11:49:44 -0000 1.47
+++ AxisTrace.cpp 5 Jan 2005 20:20:21 -0000 1.48
@@ -158,16 +158,61 @@
char
*envVars[]={"PATH","LIBPATH","LD_LIBRARY_PATH","AXISCPP_DEPLOY","PWD",
"CLASSPATH","INCLUDE","LIB","NLSPATH","OS","COMPUTERNAME","USERNAME",
"HOSTNAME","LANG","LOGIN","LOGNAME","MACHTYPE","OSTYPE","UID","USER"};
- for (unsigned i=0; i<sizeof(envVars)/4; i++) {
+ for (unsigned i=0; i<sizeof(envVars)/4; i++)
+ {
text = envVars[i];
const char *value = getenv(envVars[i]);
- if (NULL==value) text += " was not set";
- else {
+ if (NULL==value)
+ {
+ text += " was not set";
+ }
+ else
+ {
text += "=";
text += value;
}
traceLine(text.c_str());
}
+
+ // Write out the config settings
+ traceLine("-------------- Config File settings START ----------------");
+ string confLine="";
+
+ // Note these must be kept up to date if the config enum changes - I
couldn't work out how to do it automagically :-(
+ char *confProps[]={"AXCONF_WSDDFILEPATH",
+ "AXCONF_LOGPATH",
+ "AXCONF_CLIENTLOGPATH",
+ "AXCONF_CLIENTWSDDFILEPATH",
+ "AXCONF_AXISHOME",
+ "AXCONF_TRANSPORTHTTP",
+ "AXCONF_TRANSPORTSMTP",
+ "AXCONF_XMLPARSER",
+ "AXCONF_NODENAME",
+ "AXCONF_LISTENPORT",
+ "AXCONF_SSLCHANNEL"};
+
+ for (unsigned j=0; j<sizeof(confProps)/4; j++)
+ {
+ confLine ="";
+ confLine += confProps[j];
+ confLine += " = ";
+
+ const char *value = g_pConfig->getAxisConfProperty((g_axconfig)j);
+ if (NULL==value)
+ {
+ confLine += "NULL";
+ }
+ else
+ {
+ confLine += value;
+ }
+ traceLine(confLine.c_str());
+ }
+
+
+ traceLine("-------------- Config File settings END OF
----------------");
+
+
}
void AxisTrace::traceLine(const char *data)
