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 2010/09/28 19:15:57 UTC
svn commit: r1002270 - in /trafficserver/traffic/trunk/proxy/mgmt2:
cli/CLImonitor.cc cluster/ClusterCom.cc web2/Makefile.am web2/WebHttp.cc
web2/WebHttpRender.cc web2/WebOverview.cc
Author: zwoop
Date: Tue Sep 28 17:15:56 2010
New Revision: 1002270
URL: http://svn.apache.org/viewvc?rev=1002270&view=rev
Log:
TS-457 Eliminate a startup warning
This also makes more WebUI code contitional.
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc Tue Sep 28 17:15:56 2010
@@ -730,8 +730,10 @@ CLI_monitor::doMonitorDashboard(CLI_DATA
c_data->output->copyFrom(line2, strlen(line2));
c_data->output->copyFrom(CLI_globals::sep1, strlen(CLI_globals::sep1));
+#ifndef NO_WEBUI
// show dashboard
overviewGenerator->generateTableCLI(c_data->output);
+#endif
c_data->output->copyFrom("\n", strlen("\n"));
c_data->output->copyFrom(CLI_globals::sep2, strlen(CLI_globals::sep2));
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc Tue Sep 28 17:15:56 2010
@@ -1214,8 +1214,10 @@ ClusterCom::handleMultiCastFilePacket(ch
delete our_rec_cfg;
delete our_locals_ht;
}
+#ifndef NO_WEBUI
if (!file_update_failure)
WebHttpTreeRebuildJsTree();
+#endif
}
if (!file_update_failure && (rb->updateVersion(reply, our_ver, ver) != OK_ROLLBACK)) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/Makefile.am Tue Sep 28 17:15:56 2010
@@ -58,8 +58,6 @@ libweb_a_SOURCES = \
WebHttpRender.h \
WebHttpSession.cc \
WebHttpSession.h \
- WebHttpTree.cc \
- WebHttpTree.h \
WebIntrMain.cc \
WebIntrMain.h \
WebOverview.cc \
@@ -68,3 +66,9 @@ libweb_a_SOURCES = \
WebReconfig.h \
WebUtils.cc \
WebUtils.h
+
+if BUILD_WEBUI
+libweb_a_SOURCES += \
+ WebHttpTree.cc \
+ WebHttpTree.h
+endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Tue Sep 28 17:15:56 2010
@@ -2526,13 +2526,15 @@ handle_submit_snapshot_to_floppy(WebHttp
linkFile = "/configure/c_basic.ink";
}
+#ifndef NO_WEBUI
char *link = WebHttpGetLink_Xmalloc(linkFile);
- whc->response_hdr->setRefresh(0);
whc->response_hdr->setRefreshURL(link);
+ xfree(link);
+#endif
+ whc->response_hdr->setRefresh(0);
if (submit_from_page)
xfree(submit_from_page);
submit_from_page = xstrdup(linkFile);
- xfree(link);
goto Ldone;
}
}
@@ -2919,14 +2921,16 @@ handle_submit_update(WebHttpContext * wh
}
// check for restart
if (ink_hash_table_lookup(whc->post_data_ht, "restart", (void **) &cancel)) {
+#ifndef NO_WEBUI
char *link = WebHttpGetLink_Xmalloc(HTML_DEFAULT_CONFIGURE_FILE);
+ whc->response_hdr->setRefreshURL(link);
+ xfree(link);
+#endif
lmgmt->ccom->sendClusterMessage(CLUSTER_MSG_SHUTDOWN_MANAGER);
whc->response_hdr->setRefresh(15);
- whc->response_hdr->setRefreshURL(link);
if (submit_from_page)
xfree(submit_from_page);
submit_from_page = xstrdup("/restart.ink");
- xfree(link);
goto Ldone;
}
// check for clear statistics
@@ -3023,9 +3027,11 @@ handle_submit_update(WebHttpContext * wh
submit_from_page = xstrdup("/ssl_redirect.ink");
}
+#ifndef NO_WEBUI
if (submit_from_page && strcmp(submit_from_page, HTML_FEATURE_ON_OFF_FILE) == 0) {
WebHttpTreeRebuildJsTree();
}
+#endif
Ldone:
if (submit_from_page) {
@@ -3661,7 +3667,9 @@ handle_submit_otw_upgrade(WebHttpContext
char *working_dir;
char *submit_from_page;
char tmp[MAX_TMP_BUF_LEN];
+#ifndef NO_WEBUI
char *link;
+#endif
const char *cgi_path;
if (ink_hash_table_lookup(whc->post_data_ht, "submit_from_page", (void **) &submit_from_page)) {
@@ -3690,7 +3698,10 @@ handle_submit_otw_upgrade(WebHttpContext
} else {
// start upgrade = render upgrade page + spawn traffic_shell.cgi script
+#ifndef NO_WEBUI
link = WebHttpGetLink_Xmalloc(HTML_DEFAULT_MONITOR_FILE);
+ xfree(link);
+#endif
cgi_path = WebHttpAddDocRoot_Xmalloc(whc, HTML_OTW_UPGRADE_CGI_FILE);
int old_euid, old_egid;
Config_User_Root(&old_euid);
@@ -3701,7 +3712,6 @@ handle_submit_otw_upgrade(WebHttpContext
if (submit_from_page)
xfree(submit_from_page);
submit_from_page = xstrdup("/upgrade.ink");
- xfree(link);
xfree((char *) cgi_path);
}
}
@@ -4184,12 +4194,13 @@ WebHttpInit()
// initialize other modules
WebHttpAuthInit();
WebHttpLogInit();
- WebHttpRenderInit();
WebHttpSessionInit();
+#ifndef NO_WEBUI
+ WebHttpRenderInit();
WebHttpTreeInit();
+#endif
return;
-
}
//-------------------------------------------------------------------------
@@ -4249,9 +4260,8 @@ WebHttpHandleConnection(WebHttpConInfo *
WebHttpSetErrorResponse(whc, STATUS_NOT_FOUND);
goto Ltransaction_send;
}
-
} else {
-
+#ifndef NO_WEBUI
if (WebHttpTreeReturnRefresh(file)) {
// if we are handling a monitor/mrtg page, configure it to refresh
if (strncmp(file, "/monitor/", 9) == 0) {
@@ -4262,6 +4272,7 @@ WebHttpHandleConnection(WebHttpConInfo *
whc->response_hdr->setRefresh(wGlobals.refreshRate);
}
}
+#endif
// Make a note if we are a plugin. Being a plugin will affect our
// doc_root and how request files and doc_roots are joined to
// generate an absolute path. See WebHttpAddDocRoot_Xmalloc()
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Tue Sep 28 17:15:56 2010
@@ -122,6 +122,7 @@ WebHttpGetIntFromQuery(WebHttpContext *
}
}
+#ifndef NO_WEBUI
//-------------------------------------------------------------------------
// handle_alarm_object
//-------------------------------------------------------------------------
@@ -1956,10 +1957,9 @@ static int
handle_link(WebHttpContext * whc, char *tag, char *arg)
{
NOWARN_UNUSED(tag);
- char *link;
if (arg) {
- link = WebHttpGetLink_Xmalloc(arg);
+ char* link = WebHttpGetLink_Xmalloc(arg);
whc->response_bdy->copyFrom(link, strlen(link));
xfree(link);
} else {
@@ -2513,8 +2513,6 @@ handle_ssl_redirect_url(WebHttpContext *
NOWARN_UNUSED(arg);
RecInt ssl_value = 0; // current SSL value, enabled/disabled
char *hostname_FQ = NULL;
- char ssl_redirect_url[256] = "";
- char *link = NULL;
// get current SSL value and fully qualified local hostname
if (RecGetRecordInt("proxy.config.admin.use_ssl", &ssl_value) != REC_ERR_OKAY)
@@ -2522,7 +2520,8 @@ handle_ssl_redirect_url(WebHttpContext *
if (RecGetRecordString_Xmalloc("proxy.node.hostname_FQ", &hostname_FQ) != REC_ERR_OKAY)
mgmt_log(stderr, "[handle_ssl_redirect_url] Error: Unable to get local hostname \n");
- link = WebHttpGetLink_Xmalloc(HTML_MGMT_GENERAL_FILE);
+ char ssl_redirect_url[256] = "";
+ char* link = WebHttpGetLink_Xmalloc(HTML_MGMT_GENERAL_FILE);
// construct proper redirect url
snprintf(ssl_redirect_url, sizeof(ssl_redirect_url), "%s://%s:%d%s",
@@ -2550,14 +2549,13 @@ handle_host_redirect_url(WebHttpContext
NOWARN_UNUSED(arg);
RecInt ssl_value = 0; // current SSL value, enabled/disabled
char hostname[1024];
- char host_redirect_url[256] = "";
- char *link = NULL;
// get current SSL value and fully qualified local hostname
if (RecGetRecordInt("proxy.config.admin.use_ssl", &ssl_value) != REC_ERR_OKAY)
mgmt_log(stderr, "[handle_ssl_redirect_url] Error: Unable to get SSL enabled config variable\n");
gethostname(hostname, 1024);
- link = WebHttpGetLink_Xmalloc("/configure/c_net_config.ink");
+ char host_redirect_url[256] = "";
+ char* link = WebHttpGetLink_Xmalloc("/configure/c_net_config.ink");
// construct proper redirect url
snprintf(host_redirect_url, sizeof(host_redirect_url), "%s://%s:%d%s",
@@ -2568,7 +2566,6 @@ handle_host_redirect_url(WebHttpContext
// free allocated space
xfree(link);
return WEB_HTTP_ERR_OKAY;
-
}
//-------------------------------------------------------------------------
@@ -2777,7 +2774,6 @@ handle_network_object(WebHttpContext * w
void
WebHttpRenderInit()
{
-
// bind display tags to their display handlers (e.g. <@tag ...> maps
// to handle_tag())
g_display_bindings_ht = ink_hash_table_create(InkHashTableKeyType_String);
@@ -2832,6 +2828,7 @@ WebHttpRenderInit()
ink_hash_table_insert(g_display_bindings_ht, "clear_cluster_stats", (void *) handle_clear_cluster_stats);
return;
}
+#endif
//-------------------------------------------------------------------------
// WebHttpRender
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc?rev=1002270&r1=1002269&r2=1002270&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc Tue Sep 28 17:15:56 2010
@@ -896,6 +896,7 @@ overviewPage::generateAlarmsTableCLI(tex
ink_mutex_release(&accessLock);
} // end generateAlarmsTableCLI()
+#ifndef NO_WEBUI
// void overviewPage::generateAlarmsSummary(textBuffer* output)
//
// alarm summary information (Alarm! [X pending])
@@ -957,7 +958,6 @@ overviewPage::generateAlarmsSummary(WebH
HtmlRndrTableClose(output);
}
-
}
// generates the table for the overview page
@@ -1411,8 +1411,8 @@ overviewPage::addHostPanel(WebHttpContex
HtmlRndrTrClose(output);
#undef SEPARATOR
-
}
+#endif
// int overviewPage::getClusterHosts(Expanding Array* hosts)
//