Don't calculate tokens if at max.

Author: MClarkDev

src/main/java/org/barcodeapi/server/cache/CachedLimiter.java

@@ -77,7 +77,9 @@ public final boolean isEnforced() {
 	 * @return number of tokens minter
 	 */
 	public double mintTokens() {
-		if (tokenCount == -1) {
+
+		// Skip if already at limit, or unlimited
+		if ((tokenCount == tokenLimit) || (tokenCount == -1)) {
 			return 0;
 		}
 

src/main/java/org/barcodeapi/server/cache/SubscriberCache.java

@@ -47,17 +47,17 @@ public static void reload() {
 		for (int x = 0; x < users.length(); x++) {
 
 			// Get the subscriber definition from the array
-			JSONObject rawSub = users.getJSONObject(x);
+			JSONObject subInfo = users.getJSONObject(x);
 
 			try {
 
 				// Load the subscriber info
-				subscriber = new Subscriber(rawSub);
+				subscriber = new Subscriber(subInfo);
 			} catch (Exception | Error e) {
 
 				// Log if failed to load subscriber
 				LibLog._log("Failed to load subscriber.", e);
-				LibLog._logF("Subscriber: %s", rawSub);
+				LibLog._logF("Subscriber: %s", subInfo.toString());
 				continue;
 			}
 
@@ -67,24 +67,28 @@ public static void reload() {
 			}
 
 			// Map of Customer Names
-			subscribersByName.put(subscriber.getCustomer(), subscriber);
+			subscribersByName.put(//
+					subscriber.getCustomer(), subscriber);
 
 			// Map Customer IPs
-			JSONArray ips = subscriber.getIPs();
-			for (int y = 0; y < ips.length(); y++) {
-				subscribersByIP.put(ips.getString(y), subscriber);
+			JSONArray subIps = subscriber.getIPs();
+			for (int y = 0; y < subIps.length(); y++) {
+				subscribersByIP.put(//
+						subIps.getString(y), subscriber);
 			}
 
 			// Map Customer Keys
-			JSONArray keys = subscriber.getKeys();
-			for (int y = 0; y < keys.length(); y++) {
-				subscribersByKey.put(keys.getString(y), subscriber);
+			JSONArray subKeys = subscriber.getKeys();
+			for (int y = 0; y < subKeys.length(); y++) {
+				subscribersByKey.put(//
+						subKeys.getString(y), subscriber);
 			}
 
 			// Map Customer Applications
-			JSONArray apps = subscriber.getApps();
-			for (int y = 0; y < apps.length(); y++) {
-				subscribersByApp.put(apps.getString(y), subscriber);
+			JSONArray subApps = subscriber.getApps();
+			for (int y = 0; y < subApps.length(); y++) {
+				subscribersByApp.put(//
+						subApps.getString(y), subscriber);
 			}
 		}
 	}

src/main/java/org/barcodeapi/server/core/RestHandler.java

@@ -137,6 +137,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 		// Authenticate the user if required
 		if (apiAuthRequired && (ctx.getAdmin() == null)) {
 
+			// Send user unauthorized with login realm
 			getStats().hitCounter("request", "authfail");
 			getStats().hitCounter("request", "target", _NAME, "authfail");
 			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);