jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1853283 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http: proxy/FormCharSetFinder.java proxy/ProxyControl.java sampler/AccessLogSamplerBeanInfo.java
Date Sat, 09 Feb 2019 15:36:53 GMT
Author: fschumacher
Date: Sat Feb  9 15:36:52 2019
New Revision: 1853283

URL: http://svn.apache.org/viewvc?rev=1853283&view=rev
Log:
Use log string formatting.

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java?rev=1853283&r1=1853282&r2=1853283&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
Sat Feb  9 15:36:52 2019
@@ -51,9 +51,7 @@ public class FormCharSetFinder {
      */
     public void addFormActionsAndCharSet(String html, Map<String, String> formEncodings,
String pageEncoding)
             throws HTMLParseException {
-        if (log.isDebugEnabled()) {
-            log.debug("Parsing html of: " + html);
-        }
+        log.debug("Parsing html of: {}", html);
 
         Document document = Jsoup.parse(html);
         Elements forms = document.select("form");

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1853283&r1=1853282&r2=1853283&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Sat Feb  9 15:36:52 2019
@@ -1161,7 +1161,7 @@ public class ProxyControl extends Generi
                 if (subNode.isEnabled()) {
                     TestElement element = (TestElement) subNode.getUserObject();
                     if (myClass.isInstance(element)) {
-                        log.debug("Applicable: " + element.getName());
+                        log.debug("Applicable: {}", element.getName());
                         if (ascending) {
                             elements.addFirst(element);
                         } else {
@@ -1487,7 +1487,7 @@ public class ProxyControl extends Generi
         case USER_KEYSTORE:
             storePassword = JMeterUtils.getPropDefault("proxy.cert.keystorepass", DEFAULT_PASSWORD);
// $NON-NLS-1$
             keyPassword = JMeterUtils.getPropDefault("proxy.cert.keypassword", DEFAULT_PASSWORD);
// $NON-NLS-1$
-            log.info("HTTP(S) Test Script Recorder will use the keystore '"+ CERT_PATH_ABS
+ "' with the alias: '" + CERT_ALIAS + "'");
+            log.info("HTTP(S) Test Script Recorder will use the keystore '{}' with the alias:
'{}'", CERT_PATH_ABS, CERT_ALIAS);
             initUserKeyStore();
             break;
         case NONE:
@@ -1532,7 +1532,7 @@ public class ProxyControl extends Generi
                         break; // cannot continue
                     } else {
                         caCert.checkValidity(new Date(System.currentTimeMillis()+DateUtils.MILLIS_PER_DAY));
-                        log.info("Valid alias found for " + alias);
+                        log.info("Valid alias found for {}", alias);
                     }
                 }
             } catch (IOException e) { // store is faulty, we need to recreate it

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java?rev=1853283&r1=1853282&r2=1853283&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
Sat Feb  9 15:36:52 2019
@@ -59,9 +59,7 @@ public class AccessLogSamplerBeanInfo ex
             p.setValue(NOT_OTHER, Boolean.TRUE);
             p.setValue(NOT_EXPRESSION, Boolean.TRUE);
             final List<String> logParserClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
new Class[] { LogParser.class });
-            if (log.isDebugEnabled()) {
-                log.debug("found parsers: " + logParserClasses);
-            }
+            log.debug("found parsers: {}", logParserClasses);
             p.setValue(TAGS, logParserClasses.toArray(new String[logParserClasses.size()]));
 
             p = property("filterClassName"); // $NON-NLS-1$



Mime
View raw message