[1.1.1]

QueueManager tryAcquire instead of uninterrupted

Author: GoodforGod

src/main/java/io/api/etherscan/manager/impl/QueueManager.java

@@ -19,6 +19,7 @@ public class QueueManager implements IQueueManager, AutoCloseable {
 
     private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
     private final Semaphore semaphore;
+    private final long queueResetTimeInMillis;
 
     public QueueManager(int size, int resetInSec) {
         this(size, resetInSec, resetInSec);
@@ -42,14 +43,19 @@ public QueueManager(int size,
                         long queueResetTimeInMillis,
                         long delayInMillis,
                         int initialSize) {
+        this.queueResetTimeInMillis = queueResetTimeInMillis;
         this.semaphore = new Semaphore(initialSize);
         this.executorService.scheduleAtFixedRate(releaseLocks(size), delayInMillis, queueResetTimeInMillis,
                 TimeUnit.MILLISECONDS);
     }
 
     @Override
     public void takeTurn() {
-        semaphore.acquireUninterruptibly();
+        try {
+            semaphore.tryAcquire(queueResetTimeInMillis, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            // ignore
+        }
     }
 
     private Runnable releaseLocks(int toRelease) {

src/test/java/io/api/ApiRunner.java

@@ -20,7 +20,7 @@ public class ApiRunner extends Assert {
                 ? EtherScanApi.DEFAULT_KEY
                 : key;
 
-        final QueueManager queueManager = new QueueManager(1, 2200L, 2200L, 0);
+        final QueueManager queueManager = new QueueManager(1, 1200L, 1200L, 0);
         api = new EtherScanApi(ApiRunner.apiKey, EthNetwork.MAINNET, queueManager);
         apiKovan = new EtherScanApi(ApiRunner.apiKey, EthNetwork.KOVAN, queueManager);
         apiRopsten = new EtherScanApi(ApiRunner.apiKey, EthNetwork.ROPSTEN, queueManager);