Browse Source

Merge pull request #10186 from wangkx/h17841

HPCC-17841 Remove unused setting <RootFolder> form esp.xml

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 years ago
parent
commit
daa0838932

+ 0 - 6
esp/services/ws_fs/ws_fsService.cpp

@@ -130,9 +130,6 @@ void CFileSprayEx::init(IPropertyTree *cfg, const char *process, const char *ser
     xpath.clear().appendf("Software/EspProcess[@name=\"%s\"]/EspService[@name=\"%s\"]/MonitorQueueLabel", process, service);
     cfg->getProp(xpath.str(), m_MonitorQueueLabel);
 
-    xpath.clear().appendf("Software/EspProcess[@name=\"%s\"]/EspService[@name=\"%s\"]/RootFolder", process, service);
-    cfg->getProp(xpath.str(), m_RootFolder);
-
     directories.set(cfg->queryPropTree("Software/Directories"));
 
     StringBuffer prop;
@@ -141,9 +138,6 @@ void CFileSprayEx::init(IPropertyTree *cfg, const char *process, const char *ser
     prop.clear();
     prop.appendf("monitorQueueLabel=%s", m_MonitorQueueLabel.str());
     PrintLog(prop.str());
-    prop.clear();
-    prop.appendf("rootFolder=%s", m_RootFolder.str());
-    PrintLog(prop.str());
 
     if (!daliClientActive())
     {

+ 0 - 1
esp/services/ws_fs/ws_fsService.hpp

@@ -103,7 +103,6 @@ public:
 protected:
     StringBuffer m_QueueLabel;
     StringBuffer m_MonitorQueueLabel;
-    StringBuffer m_RootFolder;
     Schedule m_sched;
     Owned<IPropertyTree> directories;
 

+ 0 - 1
initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl

@@ -403,7 +403,6 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
         <EspService name="{$serviceName}" type="{$serviceType}" plugin="{$servicePlugin}">
             <QueueLabel>dfuserver_queue</QueueLabel>
             <MonitorQueueLabel>dfuserver_monitor_queue</MonitorQueueLabel>
-            <RootFolder><xsl:choose><xsl:when test="not($isLinuxInstance)">c:\</xsl:when><xsl:otherwise>/c$/</xsl:otherwise></xsl:choose>thordata</RootFolder>
         </EspService>
         <EspBinding name="{$bindName}" service="{$serviceName}" protocol="{$bindingNode/@protocol}" type="{$bindType}" plugin="{$servicePlugin}" netAddress="0.0.0.0" port="{$bindingNode/@port}">
             <xsl:call-template name="bindAuthentication">