You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/17 15:49:16 UTC
svn commit: r945154 - in /trafficserver/traffic/trunk/proxy: Makefile.am
cust_log_fmt_cnvrt.cc logcat.cc logstats.cc sac.cc
Author: mturk
Date: Mon May 17 13:49:16 2010
New Revision: 945154
URL: http://svn.apache.org/viewvc?rev=945154&view=rev
Log:
Init Layout for the remaining of tools
Modified:
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
trafficserver/traffic/trunk/proxy/logcat.cc
trafficserver/traffic/trunk/proxy/logstats.cc
trafficserver/traffic/trunk/proxy/sac.cc
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=945154&r1=945153&r2=945154&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Mon May 17 13:49:16 2010
@@ -371,6 +371,7 @@ traffic_sac_LDADD = \
traffic_cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc
traffic_cust_log_fmt_cnvrt_LDADD = \
+ $(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/libinktomi++/libinktomi++.a \
@LIBTHREAD@ \
@LIBTCL@ @LIBRT@ @LIBICONV@ @LIBDL@ @LIBEXECINFO@
Modified: trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc?rev=945154&r1=945153&r2=945154&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc (original)
+++ trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc Mon May 17 13:49:16 2010
@@ -35,6 +35,7 @@ using namespace std;
#include <unistd.h>
#include "SimpleTokenizer.h"
#include "ink_args.h"
+#include "I_Layout.h"
#include "I_Version.h"
#include "ink_assert.h"
@@ -498,6 +499,8 @@ main(int argc, char **argv)
appVersionInfo.setup(PACKAGE_NAME, PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
// process command-line arguments
//
output_file[0] = 0;
Modified: trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logcat.cc?rev=945154&r1=945153&r2=945154&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logcat.cc Mon May 17 13:49:16 2010
@@ -21,10 +21,14 @@
limitations under the License.
*/
+#include "ink_config.h"
+#include "ink_file.h"
#include "ink_unused.h"
+#include "I_Layout.h"
+#include "I_Version.h"
-#define PROGRAM_NAME "traffic_logcat"
-#define MAX_LOGBUFFER_SIZE 65536
+#define PROGRAM_NAME "traffic_logcat"
+#define MAX_LOGBUFFER_SIZE 65536
#include <poll.h>
@@ -243,6 +247,8 @@ main(int argc, char *argv[])
appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
// process command-line arguments
//
output_file[0] = 0;
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=945154&r1=945153&r2=945154&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Mon May 17 13:49:16 2010
@@ -21,7 +21,11 @@
limitations under the License.
*/
+#include "ink_config.h"
+#include "ink_file.h"
#include "ink_unused.h"
+#include "I_Layout.h"
+#include "I_Version.h"
// Includes and namespaces etc.
#include "LogStandalone.cc"
@@ -1763,6 +1767,8 @@ main(int argc, char *argv[])
appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
// Initialize some globals
memset(&totals, 0, sizeof(totals)); // Make sure counters are zero
// Initialize "elapsed" field
Modified: trafficserver/traffic/trunk/proxy/sac.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/sac.cc?rev=945154&r1=945153&r2=945154&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/sac.cc (original)
+++ trafficserver/traffic/trunk/proxy/sac.cc Mon May 17 13:49:16 2010
@@ -28,9 +28,13 @@
***************************************************************************/
+#include "ink_config.h"
+#include "ink_file.h"
#include "ink_unused.h"
+#include "I_Layout.h"
+#include "I_Version.h"
-#define PROGRAM_NAME "traffic_sac"
+#define PROGRAM_NAME "traffic_sac"
#include "LogStandalone.cc"
@@ -94,6 +98,8 @@ main(int argc, char *argv[])
appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
// take care of command-line arguments
//
snprintf(configDirectoryType, sizeof(configDirectoryType), "S%d", PATH_NAME_MAX - 1);