IRC server password

code/moya-utils/src/main/java/fi/codecrew/moya/utilities/SystemProperty.java

@@ -13,8 +13,9 @@ import org.slf4j.LoggerFactory;
 public enum SystemProperty {
 public enum SystemProperty {
 
 
 	MOYA_IRC_SERVER,
 	MOYA_IRC_SERVER,
-	MOYA_IRC_CHANNEL("#moya-debug")
-
+	MOYA_IRC_CHANNEL("#moya-debug"), 
+	MOYA_IRC_SERVERPASS(),
+	
 	;
 	;
 
 
 	private final String defaultValue;
 	private final String defaultValue;
@@ -62,4 +63,10 @@ public enum SystemProperty {
 		}
 		}
 		return intval;
 		return intval;
 	}
 	}
+
+	public String getValueOrNull() {
+		String val = System.getProperty(this.name());
+		return val;
+
+	}
 }
 }

code/moya-web/src/main/java/fi/codecrew/moya/servlet/IrcServlet.java

@@ -100,7 +100,7 @@ public class IrcServlet extends HttpServlet {
 		{
 		{
 
 
 			logger.info("Starting IRC client with server {}", ircserver);
 			logger.info("Starting IRC client with server {}", ircserver);
-			IrcBot bot = new IrcBot(ircserver, SystemProperty.MOYA_IRC_CHANNEL.getValueOrDefault(), "moya-bot");
+			IrcBot bot = new IrcBot(ircserver, 6667, SystemProperty.MOYA_IRC_SERVERPASS.getValueOrNull() ,SystemProperty.MOYA_IRC_CHANNEL.getValueOrDefault(), "moya-bot");
 			botbean.add(bot);
 			botbean.add(bot);
 			bots.add(bot);
 			bots.add(bot);
 			bot.start();
 			bot.start();
@@ -123,6 +123,11 @@ public class IrcServlet extends HttpServlet {
 	 */
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		for (IrcBot b : bots) {
 		for (IrcBot b : bots) {
+			try {
+				b.stop();
+			} catch (Throwable t) {
+				logger.info("Error stopping bot", t);
+			}
 			b.start();
 			b.start();
 		}
 		}