You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/15 04:33:59 UTC
[2/3] git commit: Merge branch 'lua_in_core' of
https://github.com/postwait/trafficserver into dev/lua_conf
Merge branch 'lua_in_core' of https://github.com/postwait/trafficserver into dev/lua_conf
* 'lua_in_core' of https://github.com/postwait/trafficserver:
First whack a lua in core.
Conflicts:
proxy/Main.cc
proxy/Makefile.am
proxy/http/remap/UrlRewrite.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/72da02ab
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/72da02ab
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/72da02ab
Branch: refs/heads/lua_config
Commit: 72da02ab0afddda6a0164580d6a4f27ef49f9a8f
Parents: ba44a77 c2ca0dc
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jan 14 20:32:02 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jan 14 20:32:02 2014 -0700
----------------------------------------------------------------------
configure.ac | 8 +-
iocore/net/SSLUtils.cc | 40 +++++
proxy/Main.cc | 4 +
proxy/Makefile.am | 14 +-
proxy/http/remap/UrlRewrite.h | 4 +
proxy/luaConfig.cc | 340 +++++++++++++++++++++++++++++++++++++
proxy/luaConfig.h | 92 ++++++++++
7 files changed, 497 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72da02ab/configure.ac
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72da02ab/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72da02ab/proxy/Main.cc
----------------------------------------------------------------------
diff --cc proxy/Main.cc
index d715319,c9156d5..f9d0919
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@@ -86,8 -86,10 +86,9 @@@ extern "C" int plock(int)
#include "Update.h"
#include "congest/Congestion.h"
#include "RemapProcessor.h"
-#include "XmlUtils.h"
#include "I_Tasks.h"
#include "InkAPIInternal.h"
+ #include "luaConfig.h"
#include <ts/ink_cap.h>
@@@ -314,8 -365,11 +315,11 @@@ initialize_process_manager(
RecordsConfigOverrideFromEnvironment();
}
+ luaConfigInit();
++
+ //
// Start up manager
- //
- pmgmt = NEW(new ProcessManager(remote_management_flag, management_directory));
+ pmgmt = NEW(new ProcessManager(remote_management_flag));
pmgmt->start();
RecProcessInitMessage(remote_management_flag ? RECM_CLIENT : RECM_STAND_ALONE);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72da02ab/proxy/Makefile.am
----------------------------------------------------------------------
diff --cc proxy/Makefile.am
index 04d72c8,34a9557..38d0c8a
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@@ -45,8 -49,11 +45,9 @@@ AM_CPPFLAGS =
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
- -I$(srcdir)/api/ts \
- -I. \
- -I./api/ts \
+ -I$(top_builddir)/proxy/api/ts \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ $(LUA_CFLAGS)
noinst_HEADERS = \
ConfigParse.h \
@@@ -87,8 -100,12 +88,10 @@@ traffic_server_SOURCES =
FetchSM.cc \
InkAPIInternal.h \
InkIOCoreAPI.cc \
- InkXml.cc \
- InkXml.h \
IPAllow.cc \
IPAllow.h \
+ luaConfig.cc \
+ luaConfig.h \
Main.cc \
Main.h \
ParentSelection.cc \
@@@ -218,12 -237,13 +222,13 @@@ traffic_sac_SOURCES =
Plugin.cc \
InkAPI.cc \
FetchSM.cc \
- InkIOCoreAPI.cc
+ InkIOCoreAPI.cc \
- luaConfig.cc \
- InkXml.cc
++ luaConfig.cc
- traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
+ traffic_sac_LDFLAGS = @LUA_LUAJIT_LDFLAGS@ @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_sac_LDADD = \
http/libhttp.a \
+ shared/libdiagsconfig.a \
http/remap/libhttp_remap.a \
congest/libCongestionControl.a \
logging/liblogging.a \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/72da02ab/proxy/http/remap/UrlRewrite.h
----------------------------------------------------------------------