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 12:22:38 UTC
svn commit: r945064 - in /trafficserver/traffic/trunk/proxy: ./ mgmt2/
mgmt2/api2/ mgmt2/api2/remote/ mgmt2/cli/ mgmt2/cli2/ mgmt2/cop/ mgmt2/tools/
Author: mturk
Date: Mon May 17 10:22:37 2010
New Revision: 945064
URL: http://svn.apache.org/viewvc?rev=945064&view=rev
Log:
Make sure Layout is created in every program. This means linking with iocore/libinkutils for programs that are not already linked
Modified:
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Mon May 17 10:22:37 2010
@@ -56,6 +56,7 @@ extern "C" int plock(int);
#include "P_Cluster.h"
#include "P_HostDB.h"
#include "P_Cache.h"
+#include "I_Layout.h"
#include "I_Machine.h"
#include "RecordsConfig.h"
#include "Transform.h"
@@ -1781,6 +1782,8 @@ main(int argc, char **argv)
appVersionInfo.setup(PACKAGE_NAME,"traffic_server", PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
chdir_root(); // change directory to the install root of traffic server.
process_args(argument_descriptions, n_argument_descriptions, argv);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Mon May 17 10:22:37 2010
@@ -43,6 +43,7 @@
#include "WebOverview.h"
#include "FileManager.h"
#include "WebReconfig.h"
+#include "I_Layout.h"
#include "I_Version.h"
#include "ink_syslog.h"
#include "ink_lockfile.h"
@@ -485,6 +486,8 @@ set_process_limits(int fds_throttle)
int
main(int argc, char **argv)
{
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
// change the directory to the "root" directory
chdir_root();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Mon May 17 10:22:37 2010
@@ -40,12 +40,12 @@ AM_CPPFLAGS = \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-DPKGLOGDIR=\"$(pkglogdir)\" \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -DPKGSYSUSER=\"$(pkgsysuser)\"
+ -DPKGSYSUSER=\"$(pkgsysuser)\"
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
-noinst_LIBRARIES = libmgmt_p.a librecords.a
+noinst_LIBRARIES = libmgmt_p.a librecords.a
bin_PROGRAMS = traffic_manager
@@ -119,6 +119,7 @@ traffic_manager_LDADD = \
$(top_builddir)/proxy/mgmt2/tools/libinksysapi.a \
$(top_builddir)/proxy/mgmt2/tools/libinkconfigapi.a \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBEXPAT@ @LIBPCRE@ \
@LIBSSL@ @LIBDB@ @LIBSQLITE3@ @LIBTCL@ @LIBICONV@ \
@LIBM@ @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc Mon May 17 10:22:37 2010
@@ -31,6 +31,7 @@
***************************************************************************/
#include "inktomi++.h"
#include <limits.h>
+#include "I_Layout.h"
#include "INKMgmtAPI.h"
#include "CfgContextManager.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am Mon May 17 10:22:37 2010
@@ -33,6 +33,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
-I$(top_srcdir)/proxy/mgmt2/api2 \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc Mon May 17 10:22:37 2010
@@ -39,6 +39,7 @@
#include "ink_config.h"
#include <strings.h>
#include "ink_string.h"
+#include "I_Layout.h"
#include "ParseRules.h"
#include "CoreAPI.h"
#include "CoreAPIShared.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Mon May 17 10:22:37 2010
@@ -29,6 +29,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/remote \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
@@ -40,7 +41,7 @@ DEFS += $(MGMT_DEFS)
noinst_PROGRAMS = traffic_api_cli_remote
-noinst_LIBRARIES = libmgmtapiremote.a
+noinst_LIBRARIES = libmgmtapiremote.a
libmgmtapiremote_a_SOURCES = \
../CfgContextImpl.cc \
../CfgContextManager.cc \
@@ -55,9 +56,10 @@ libmgmtapiremote_a_SOURCES = \
NetworkUtilsRemote.cc \
NetworkUtilsRemote.h
-traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
traffic_api_cli_remote_LDADD = \
libmgmtapiremote.a \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBTCL@ @LIBDB@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@ @LIBEXECINFO@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am Mon May 17 10:22:37 2010
@@ -28,6 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\"
@@ -72,5 +73,6 @@ traffic_line_LDADD = \
libcli_tl.a \
$(top_builddir)/libinktomi++/libinktomi++.a \
$(top_builddir)/librecords/libreclocal.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBTCL@ @LIBRT@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am Mon May 17 10:22:37 2010
@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libinktomi++ \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/mgmt2/tools \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\"
@@ -81,6 +82,7 @@ traffic_shell_LDADD = \
$(top_builddir)/proxy/mgmt2/tools/libinkconfigapi.a \
$(top_builddir)/proxy/mgmt2/utils/libutils_lm.a \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
$(LIBTCL) \
@LIBDL@ \
@LIBM@ \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc Mon May 17 10:22:37 2010
@@ -27,6 +27,8 @@
#include "tcl.h"
#include <string.h>
#include "ink_args.h"
+#include "ink_file.h"
+#include "I_Layout.h"
#include "I_Version.h"
#include <CliMgmtUtils.h>
#include "../api2/include/INKMgmtAPI.h"
@@ -55,6 +57,13 @@ main(int argc, char *argv[])
appVersionInfo.setup(PACKAGE_NAME,"traffic_shell", PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
+ // TODO: Figure out why is this needed
+ if (argc < 0) {
+ ink_ftell(stdout);
+ }
+
// Argument description table used to describe how to parse command line args,
// see 'ink_args.h' for meanings of the various fields
ArgumentDescription argument_descriptions[] = {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am Mon May 17 10:22:37 2010
@@ -26,12 +26,13 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DBINDIR=\"$(bindir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-DPKGLOGDIR=\"$(pkglogdir)\" \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -DPKGSYSUSER=\"$(pkgsysuser)\"
+ -DPKGSYSUSER=\"$(pkgsysuser)\"
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
@@ -42,6 +43,7 @@ traffic_cop_SOURCES = TrafficCop.cc
traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_cop_LDADD = \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBTCL@ \
@LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBTHREAD@ @LIBDL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Mon May 17 10:22:37 2010
@@ -22,6 +22,7 @@
*/
#include "inktomi++.h"
+#include "I_Layout.h"
#include "I_Version.h"
#if (HOST_OS == linux)
@@ -1929,6 +1930,12 @@ main(int argc, char *argv[])
appVersionInfo.setup(PACKAGE_NAME,"traffic_cop", PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
+ // TODO: Figure out why is this needed
+ if (argc < 0) {
+ ink_ftell(stdout);
+ }
for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "-stop") == 0) {
fprintf(stdout, "Cool! I think I'll be a STOP cop!\n");
@@ -1938,7 +1945,6 @@ main(int argc, char *argv[])
exit(0);
}
}
-
// Detach STDIN, STDOUT, and STDERR (basically, "nohup"). /leif
signal(SIGHUP, SIG_IGN);
signal(SIGTSTP, SIG_IGN);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am Mon May 17 10:22:37 2010
@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/api2 \
-I$(top_srcdir)/proxy/mgmt2/api2/include \
-I$(top_srcdir)/proxy/mgmt2 \
+ $(iocore_include_dirs) \
-DPREFIX=\"$(prefix)\" \
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
@@ -41,12 +42,14 @@ traffic_vip_config_SOURCES = VIPConfig.c
traffic_vip_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_vip_config_LDADD = \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
traffic_net_config_SOURCES = NetConfig.cc
traffic_net_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_net_config_LDADD = \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
traffic_time_config_SOURCES = TimeConfig.cc
@@ -59,6 +62,7 @@ traffic_mcast_snoop_SOURCES = McastSnoop
traffic_mcast_snoop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_mcast_snoop_LDADD = \
$(top_builddir)/libinktomi++/libinktomi++.a \
+ $(top_builddir)/iocore/utils/libinkutils.a \
@LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBTHREAD@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
libinksysapi_a_SOURCES = SysAPI.cc SysAPI.h
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc Mon May 17 10:22:37 2010
@@ -37,6 +37,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include "I_Layout.h"
+#include "I_Version.h"
#include "Tokenizer.h"
@@ -284,6 +286,12 @@ main(int argc, char **argv)
// Process command line arguments and dump into variables
process_args(argument_descriptions, n_argument_descriptions, argv);
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
+ // TODO: Figure out why is this needed
+ if (argc < 0) {
+ ink_ftell(stdout);
+ }
init();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc Mon May 17 10:22:37 2010
@@ -71,9 +71,10 @@ struct ifafilt;
#include <sys/raw.h>
#include <signal.h>
#include <errno.h>
-#include <inktomi++.h>
-
+#include "inktomi++.h"
#include "ink_bool.h"
+#include "I_Layout.h"
+#include "I_Version.h"
// TODO: consolidate location of these defaults
#define DEFAULT_ROOT_DIRECTORY PREFIX
@@ -2975,6 +2976,8 @@ main(int argc, char **argv)
}
fun_no = atoi(argv[1]);
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
switch (fun_no) {
case 0:
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc Mon May 17 10:22:37 2010
@@ -21,6 +21,10 @@
limitations under the License.
*/
+#include "ink_defs.h"
+#include "ink_file.h"
+#include "I_Layout.h"
+
#include <ctype.h>
#include <limits.h>
#include <stdlib.h>
@@ -34,8 +38,6 @@
#include <signal.h>
#include <time.h>
-#include "ink_defs.h"
-
// TODO: consolidate location of these defaults
#define DEFAULT_ROOT_DIRECTORY PREFIX
#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
@@ -76,6 +78,8 @@ main(int argc, char *argv[])
close(fd);
}
buffer[0] = 0;
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
if ((env_path = getenv("TS_ROOT"))) {
strncpy(buffer, env_path, sizeof(buffer) - 1);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc?rev=945064&r1=945063&r2=945064&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc Mon May 17 10:22:37 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "inktomi++.h"
/*
*
* VIPConfig.cc
@@ -33,6 +32,9 @@
*
*/
+#include "inktomi++.h"
+#include "I_Layout.h"
+#include "I_Version.h"
#include <sys/un.h>
struct ifafilt;
@@ -55,8 +57,6 @@ struct ifafilt;
#define UP_INTERFACE 0
#define DOWN_INTERFACE 1
-#include "inktomi++.h"
-
void up_interface(char *binary, char *vip, char *interface);
void down_interface(char *binary, char *vip, char *interface);
@@ -80,6 +80,13 @@ main(int argc, char **argv)
int operation, interface_id;
char binary[1024], tinterface[1024], interface[1024], vip[1024];
+ // Before accessing file system initialize Layout engine
+ create_default_layout();
+ // TODO: Figure out why is this needed
+ if (argc < 0) {
+ ink_ftell(stdout);
+ }
+
if (argc != 6 || (argc != 2 && strstr(argv[1], "help"))) {
#ifdef DEBUG
fprintf(stderr, "[vip_config] Usage incorrect(1)\n");