Added different warnings when concurrent messages occur.

New method in Language. Switched to Java 8
Tillerino · Oct 23, 2015 · 08034e0 · 08034e0
1 parent 01f7199
commit 08034e0
Show file tree

Hide file tree

Showing 26 changed files with 161 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - openjdk7
+  - oraclejdk8
 before_install:
   - git submodule init
   - git submodule update

diff --git a/tillerinobot/pom.xml b/tillerinobot/pom.xml
@@ -11,8 +11,8 @@
 				<version>3.0</version>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>

diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/IRCBot.java b/tillerinobot/src/main/java/tillerino/tillerinobot/IRCBot.java
@@ -17,6 +17,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -144,13 +145,17 @@ public void onAction(ActionEvent event) throws Exception {
 
 	/**
 	 * This wrapper around a Semaphore keeps track of when it was last acquired
-	 * via {@link #tryAcquire()}.
+	 * via {@link #tryAcquire()} and what happened since.
 	 */
 	public static class TimingSemaphore {
 		private long lastAcquired = 0;
 
 		private Thread lastAcquiredThread = null;
 
+		private int attemptsSinceLastAcquired = 0;
+
+		private boolean sentWarning = false;
+
 		private final Semaphore semaphore;
 
 		public TimingSemaphore(int permits, boolean fair) {
@@ -163,6 +168,8 @@ public synchronized boolean tryAcquire() {
 			}
 			lastAcquired = System.currentTimeMillis();
 			lastAcquiredThread = Thread.currentThread();
+			attemptsSinceLastAcquired = 0;
+			sentWarning = false;
 			return true;
 		}
 
@@ -177,6 +184,18 @@ public Thread getLastAcquiredThread() {
 		public void release() {
 			semaphore.release();
 		}
+
+		public int getAttemptsSinceLastAcquired() {
+			return ++attemptsSinceLastAcquired;
+		}
+
+		public boolean isSentWarning() {
+			if(!sentWarning) {
+				sentWarning = true;
+				return false;
+			}
+			return true;
+		}
 	}
 
 	/**
@@ -189,12 +208,25 @@ public TimingSemaphore load(String arg0) throws Exception {
 		}
 	});
 
-	void handleSemaphoreInUse(String purpose, TimingSemaphore semaphore) {
+	void handleSemaphoreInUse(String purpose, TimingSemaphore semaphore, Language lang, IRCBotUser user) {
 		double processing = (System.currentTimeMillis() - semaphore.getLastAcquired()) / 1000d;
-		StackTraceElement[] stackTrace = semaphore.getLastAcquiredThread().getStackTrace();
-		Throwable t = new Throwable("Processing thread's stack trace");
-		t.setStackTrace(stackTrace);
-		log.warn(purpose + " - request has been processing for " + processing, t);
+		if(processing > 5) {
+			StackTraceElement[] stackTrace = semaphore.getLastAcquiredThread().getStackTrace();
+			stackTrace = Stream.of(stackTrace)
+					.filter(elem -> elem.getClassName().contains("tillerino"))
+					.toArray(StackTraceElement[]::new);
+			Throwable t = new Throwable("Processing thread's stack trace");
+			t.setStackTrace(stackTrace);
+			log.warn(purpose + " - request has been processing for " + processing, t);
+			if(!semaphore.isSentWarning()) {
+				user.message(lang.getPatience());
+			}
+		} else {
+			log.debug(purpose);
+		}
+		if(semaphore.getAttemptsSinceLastAcquired() >= 3 && !semaphore.isSentWarning()) {
+			user.message("[http://i.imgur.com/Ykfua8r.png ...]");
+		}
 	}
 
 	void processPrivateAction(IRCBotUser user, String message) {
@@ -204,7 +236,7 @@ void processPrivateAction(IRCBotUser user, String message) {
 
 		TimingSemaphore semaphore = perUserLock.getUnchecked(user.getNick());
 		if(!semaphore.tryAcquire()) {
-			handleSemaphoreInUse("concurrent action", semaphore);
+			handleSemaphoreInUse("concurrent action", semaphore, lang, user);
 			return;
 		}
 
@@ -354,7 +386,7 @@ void processPrivateMessage(final IRCBotUser user, String originalMessage) {
 
 		TimingSemaphore semaphore = perUserLock.getUnchecked(user.getNick());
 		if(!semaphore.tryAcquire()) {
-			handleSemaphoreInUse("concurrent message", semaphore);
+			handleSemaphoreInUse("concurrent message", semaphore, lang, user);
 			return;
 		}
 

diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Czech.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Czech.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Dansk.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Dansk.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Default.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Default.java
@@ -279,4 +279,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return "This references a set of beatmaps, not a single beatmap.";
 	}
+
+	@Override
+	public String getPatience() {
+		return "Just a second...";
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Deutsch.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Deutsch.java
@@ -226,4 +226,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return "Das bezieht sich auf ein Set von Beatmaps statt auf eine einzelne Beatmap.";
 	}
+
+	@Override
+	public String getPatience() {
+		return "Gib mir einen Moment...";
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Farsi.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Farsi.java
@@ -224,4 +224,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Francais.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Francais.java
@@ -232,4 +232,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Greek.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Greek.java
@@ -230,4 +230,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Hebrew.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Hebrew.java
@@ -216,4 +216,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Italiano.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Italiano.java
@@ -231,4 +231,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Japanese.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Japanese.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Korean.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Korean.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Language.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Language.java
@@ -4,6 +4,7 @@
 
 import org.tillerino.osuApiModel.Mods;
 import org.tillerino.osuApiModel.OsuApiUser;
+
 import tillerino.tillerinobot.BeatmapMeta;
 import tillerino.tillerinobot.IRCBot.IRCBotUser;
 import tillerino.tillerinobot.RecommendationsManager.Recommendation;
@@ -304,4 +305,11 @@ public interface Language {
 	 * @return
 	 */
 	String isSetId();
+
+	/**
+	 * Bot is doing things. Please have patience.
+	 * 
+	 * @return
+	 */
+	String getPatience();
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Lithuanian.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Lithuanian.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Nederlands.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Nederlands.java
@@ -227,4 +227,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Polski.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Polski.java
@@ -230,4 +230,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Portuguese.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Portuguese.java
@@ -243,4 +243,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/PortuguesePortugal.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/PortuguesePortugal.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Romana.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Romana.java
@@ -279,4 +279,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Russian.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Russian.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Spanish.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Spanish.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Svenska.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Svenska.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Tsundere.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Tsundere.java
@@ -645,4 +645,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }
diff --git a/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Turkish.java b/tillerinobot/src/main/java/tillerino/tillerinobot/lang/Turkish.java
@@ -229,4 +229,9 @@ public String noRecentPlays() {
 	public String isSetId() {
 		return new Default().isSetId();
 	}
+
+	@Override
+	public String getPatience() {
+		return new Default().getPatience();
+	}
 }