commit f9872a0ddfbd926af3b4b7194b04e333aebf246c
author Thomas Vachuska <tom@onlab.us> Thu May 05 13:56:25 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 05 21:38:55 2016 +0000
tree d8d50f6320712f0baf3bf5eaba3401715e204604
parent 0463cf98ee58802f991b756e904d3b8a6faa3992

Fixing a small bug in warden logging.

Change-Id: I27439f1309a954738e09a2732275f769a22ace3e

utils/warden/src/main/java/org/onlab/warden/Warden.java

diff --git a/utils/warden/src/main/java/org/onlab/warden/Warden.java b/utils/warden/src/main/java/org/onlab/warden/Warden.java
index 0e09def..6f6ada5 100644
--- a/utils/warden/src/main/java/org/onlab/warden/Warden.java
+++ b/utils/warden/src/main/java/org/onlab/warden/Warden.java
@@ -55,6 +55,7 @@
     private static final long TIMEOUT = 10; // 10 seconds
     private static final int MAX_MINUTES = 240; // 4 hours max
     private static final int MINUTE = 60_000; // 1 minute
+    private static final int DEFAULT_MINUTES = 60;
 
     private final File log = new File("warden.log");
 
@@ -157,11 +158,11 @@
         long now = System.currentTimeMillis();
         Reservation reservation = currentUserReservation(userName);
         if (reservation == null) {
-            checkArgument(minutes > 0, "Number of minutes must be positive");
+            checkArgument(minutes >= 0, "Number of minutes must be non-negative");
             Set<String> cells = getAvailableCells();
             checkState(!cells.isEmpty(), "No cells are presently available");
             String cellName = ImmutableList.copyOf(cells).get(random.nextInt(cells.size()));
-            reservation = new Reservation(cellName, userName, now, minutes);
+            reservation = new Reservation(cellName, userName, now, minutes == 0 ? DEFAULT_MINUTES : minutes);
         } else if (minutes == 0) {
             // If minutes are 0, simply return the cell definition
             return getCellDefinition(reservation.cellName);
@@ -171,7 +172,7 @@
 
         reserveCell(reservation.cellName, reservation);
         installUserKeys(reservation.cellName, userName, sshKey);
-        log(userName, reservation.cellName, "borrowed for " + minutes + " minutes");
+        log(userName, reservation.cellName, "borrowed for " + reservation.duration + " minutes");
         return getCellDefinition(reservation.cellName);
     }