CassOnMars
diff --git a/‎src/test/java/com/rabbitmq/examples/PerfTest.java
Lines changed: 14 additions & 11 deletions b/‎src/test/java/com/rabbitmq/examples/PerfTest.java
Lines changed: 14 additions & 11 deletions
@@ -36,8 +36,6 @@
 
 public class PerfTest {
 
-    private static String testID;
-	
     public static void main(String[] args) {
         Options options = getOptions();
         CommandLineParser parser = new GnuParser();
@@ -48,9 +46,9 @@ public static void main(String[] args) {
                 usage(options);
                 System.exit(0);
             }
-            testID = new SimpleDateFormat("HH:mm:ss.SSS").format(Calendar.
+            String testID = new SimpleDateFormat("HHmmss-SSS").format(Calendar.
             		getInstance().getTime());
-            testID                   = strArg(cmd, 'd', "test-" + testID);
+            testID            = strArg(cmd, 'd', "test-"+testID);
             String exchangeType      = strArg(cmd, 't', "direct");
             String exchangeName      = strArg(cmd, 'e', exchangeType);
             String queueName         = strArg(cmd, 'u', "");
@@ -80,12 +78,13 @@ public static void main(String[] args) {
             String uri               = strArg(cmd, 'h', "amqp://localhost");
 
             //setup
-            PrintlnStats stats = new PrintlnStats(1000L * samplingInterval,
-                                    producerCount > 0,
-                                    consumerCount > 0,
-                                    (flags.contains("mandatory") ||
-                                     flags.contains("immediate")),
-                                    confirm != -1);
+            PrintlnStats stats = new PrintlnStats(testID,
+            		1000L * samplingInterval,
+            		producerCount > 0,
+            		consumerCount > 0,
+            		(flags.contains("mandatory") || 
+            				flags.contains("immediate")),
+    				confirm != -1);
 
             ConnectionFactory factory = new ConnectionFactory();
             factory.setShutdownTimeout(0); // So we still shut down even with slow consumers
@@ -199,20 +198,24 @@ private static class PrintlnStats extends Stats {
         private final boolean recvStatsEnabled;
         private final boolean returnStatsEnabled;
         private final boolean confirmStatsEnabled;
+        
+        private final String testID;
 
-        public PrintlnStats(long interval,
+        public PrintlnStats(String testID, long interval,
                             boolean sendStatsEnabled, boolean recvStatsEnabled,
                             boolean returnStatsEnabled, boolean confirmStatsEnabled) {
             super(interval);
             this.sendStatsEnabled = sendStatsEnabled;
             this.recvStatsEnabled = recvStatsEnabled;
             this.returnStatsEnabled = returnStatsEnabled;
             this.confirmStatsEnabled = confirmStatsEnabled;
+            this.testID = testID;
         }
         @Override
         protected void report(long now) {
             System.out.print("id: " + testID + ", ");
+            
             System.out.print("time: " + String.format("%.3f", (now - startTime)/1000.0) + "s");
 
             showRate("sent",      sendCountInterval,    sendStatsEnabled,                        elapsedInterval);