incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ak...@apache.org
Subject svn commit: r733985 - /incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java
Date Tue, 13 Jan 2009 01:35:29 GMT
Author: akara
Date: Mon Jan 12 17:35:28 2009
New Revision: 733985

URL: http://svn.apache.org/viewvc?rev=733985&view=rev
Log:
Fix for issue OLIO-26: Changed uploaded configuration file names to match pattern to be displayed
on stats page.

Modified:
    incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java

Modified: incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java?rev=733985&r1=733984&r2=733985&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java (original)
+++ incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java Mon Jan
12 17:35:28 2009
@@ -70,14 +70,14 @@
             for (String webhost : webhosts) {
                 RunContext.getFile(webhost, webServerConfPath +
                         File.separator + "httpd.conf", RunContext.getOutDir() +
-                        "httpd.conf." + getHostName(webhost));
+                        "httpd_conf.log." + getHostName(webhost));
             }
         } else if ("lighttpd".equals(webserverType)) {
             webServerService = LighttpdService.getHandle();
             for (String webhost : webhosts) {
                 RunContext.getFile(webhost, webServerConfPath +
                         File.separator + "lighttpd.conf",
-                        RunContext.getOutDir() + "lighttpd.conf." +
+                        RunContext.getOutDir() + "lighttpd_conf.log." +
                         getHostName(webhost));
             }
         } else if ("glassfish".equals(webserverType)) {
@@ -85,19 +85,19 @@
             for (String webhost : webhosts) {
                 RunContext.getFile(webhost, webServerConfPath +
                         File.separator + "domain.xml",
-                        RunContext.getOutDir() + "domain.xml." +
+                        RunContext.getOutDir() + "domain_xml.log." +
                         getHostName(webhost));
             }
         }
         if (phpIniPath != null && phpIniPath.length() > 0)
             for (String webhost : webhosts) {
                 RunContext.getFile(webhost, phpIniPath + "/php.ini",
-                        RunContext.getOutDir() + "php.ini." +
+                        RunContext.getOutDir() + "php_ini.log." +
                         getHostName(webhost));
             }
 
         RunContext.getFile(dbhost, dbConfPath + "/my.cnf",
-                RunContext.getOutDir() + "my.cnf." + getHostName(dbhost));
+                RunContext.getOutDir() + "my_cnf.log." + getHostName(dbhost));
 
         // Reloading database and media as necessary.
         boolean reloadDB = Boolean.parseBoolean(
@@ -151,8 +151,7 @@
         
         if (mediaHandle != null)
             mediaHandle.waitFor();
-
-        /*
+        
         //start the memcache servers
         memcacheServers =
                  params.getHostPorts("cacheServers/fa:hostConfig/fa:hostPorts");
@@ -174,7 +173,6 @@
                 cacheBinPath);
         if ( !memcachedService.restartServers())
             throw (new Exception("Memcached server(s) restart failed"));
-        */
         
         // Now start the web servers
         if (webServerService != null) {



Mime
View raw message