Mercurial > stress-tester

changeset 598:7cc4c88a12b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor
author Devel 1
date Thu, 05 Oct 2017 09:31:22 +0200
parents e5e096814c43
children 55338eaa7265
files stress-tester-reporter/src/main/java/com/passus/st/reporter/snmp/SnmpLogger.java stress-tester/src/main/java/com/passus/st/PcapReporter.java
diffstat 2 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/stress-tester-reporter/src/main/java/com/passus/st/reporter/snmp/SnmpLogger.java	Wed Oct 04 14:45:22 2017 +0200
+++ b/stress-tester-reporter/src/main/java/com/passus/st/reporter/snmp/SnmpLogger.java	Thu Oct 05 09:31:22 2017 +0200
@@ -92,22 +92,22 @@
             String swapFree = getAsString(oid_swapFree);
             String ramTotal = getAsString(oid_ramTotal);
             String swapTotal = getAsString(oid_swapTotal);
-            
-            String cpuUser = this.getAsString(oid_cpuUser);
-            String cpuIdle = this.getAsString(oid_cpuIdle);
+            String cpuUser = getAsString(oid_cpuUser);
+            String cpuIdle = getAsString(oid_cpuIdle);
+
             builder.append(cpuLoad1m);
             builder.append(";");
             builder.append(cpuLoad5m);
             builder.append(";");
             builder.append(cpuLoad15m);
             builder.append(";");
-            builder.append((Long.parseLong(ramTotal) - Long.parseLong(ramFree))*1024);
+            builder.append((Long.parseLong(ramTotal) - Long.parseLong(ramFree)) * 1024);
             builder.append(";");
-            builder.append((Long.parseLong(swapTotal) - Long.parseLong(swapFree))*1024);
+            builder.append((Long.parseLong(swapTotal) - Long.parseLong(swapFree)) * 1024);
             builder.append(";");
-            builder.append((Long.parseLong(ramTotal))*1024);
+            builder.append((Long.parseLong(ramTotal)) * 1024);
             builder.append(";");
-            builder.append((Long.parseLong(swapTotal))*1024);
+            builder.append((Long.parseLong(swapTotal)) * 1024);
             builder.append(";");
             builder.append(cpuUser);
             builder.append(";");
@@ -194,4 +194,7 @@
         return target;
     }
 
+    public static String createQuasiUrl(String host, int port) {
+        return "udp:" + host + '/' + port;
+    }
 }
--- a/stress-tester/src/main/java/com/passus/st/PcapReporter.java	Wed Oct 04 14:45:22 2017 +0200
+++ b/stress-tester/src/main/java/com/passus/st/PcapReporter.java	Thu Oct 05 09:31:22 2017 +0200
@@ -43,12 +43,6 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import static com.passus.st.Main.printMetrics;
-import static com.passus.st.utils.CliUtils.option;
-import static com.passus.st.Main.printMetrics;
-import static com.passus.st.utils.CliUtils.option;
-import static com.passus.st.Main.printMetrics;
-import static com.passus.st.utils.CliUtils.option;
 
 /**
  *