[jetrix-cvs] SF.net SVN: jetrix:[741] monitor/trunk/src/main

[<sm...@us...>]

Revision: 741
          http://jetrix.svn.sourceforge.net/jetrix/?rev=741&view=rev
Author:   smanux
Date:     2008-08-26 13:28:21 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
Offline servers are no longer listed

Modified Paths:
--------------
    monitor/trunk/src/main/java/net/jetrix/monitor/ServerInfo.java
    monitor/trunk/src/main/webapp/index.jsp
    monitor/trunk/src/main/webapp/servers-xml.jsp

Modified: monitor/trunk/src/main/java/net/jetrix/monitor/ServerInfo.java
===================================================================
--- monitor/trunk/src/main/java/net/jetrix/monitor/ServerInfo.java	2008-08-26 07:36:28 UTC (rev 740)
+++ monitor/trunk/src/main/java/net/jetrix/monitor/ServerInfo.java	2008-08-26 13:28:21 UTC (rev 741)
@@ -39,9 +39,10 @@
     private String IP;
     private String version;
     private String description;
-    private boolean spectate;
     private String country;
     private String website;
+    private boolean spectate;
+    private String spectatorPassword;
 
     private Date dateAdded;
     private Date lastChecked;
@@ -110,16 +111,6 @@
         this.description = description;
     }
 
-    public boolean isSpectate()
-    {
-        return spectate;
-    }
-
-    public void setSpectate(boolean spectate)
-    {
-        this.spectate = spectate;
-    }
-
     public String getCountry()
     {
         return country;
@@ -140,6 +131,26 @@
         this.website = website;
     }
 
+    public boolean isSpectate()
+    {
+        return spectate;
+    }
+
+    public void setSpectate(boolean spectate)
+    {
+        this.spectate = spectate;
+    }
+
+    public String getSpectatorPassword()
+    {
+        return spectatorPassword;
+    }
+
+    public void setSpectatorPassword(String spectatorPassword)
+    {
+        this.spectatorPassword = spectatorPassword;
+    }
+
     public Date getDateAdded()
     {
         return dateAdded;
@@ -249,4 +260,12 @@
     {
         this.aliases = aliases;
     }
+
+    /**
+     * Tells if the server has been online in the last 15 minutes.
+     */
+    public boolean isOnline()
+    {
+        return lastOnline != null && lastOnline.getTime() > System.currentTimeMillis() - 15 * 60 * 1000;
+    }
 }

Modified: monitor/trunk/src/main/webapp/index.jsp
===================================================================
--- monitor/trunk/src/main/webapp/index.jsp	2008-08-26 07:36:28 UTC (rev 740)
+++ monitor/trunk/src/main/webapp/index.jsp	2008-08-26 13:28:21 UTC (rev 741)
@@ -5,7 +5,6 @@
 <%@ page import="org.springframework.web.context.WebApplicationContext" %>
 <%@ page import="net.jetrix.monitor.ServerInfo" %>
 <%@ page import="net.jetrix.monitor.dao.ServerInfoDao" %>
-<%@ page import="java.util.TimeZone" %>
 
 <%
     WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
@@ -14,8 +13,13 @@
     List<ServerInfo> servers = dao.getServers();
 
     int totalPlayerCount = 0;
+    int serverCount = 0;
     Date lastChecked = null;
     for (ServerInfo server : servers) {
+        if (server.isOnline()) {
+            serverCount++;
+        }
+        
         totalPlayerCount += server.getStats().getPlayerCount();
         if (lastChecked == null || (server.getLastChecked() != null && server.getLastChecked().after(lastChecked))) {
             lastChecked = server.getLastChecked();
@@ -39,7 +43,7 @@
 <p>This is a list of the public TetriNET servers. The list is refreshed every 5 minutes. Feel free to add your favorite
 server if it's not in the list.</p>
 
-<p>There are currently <b><%= totalPlayerCount %></b> players online on <b><%= servers.size() %></b> servers. The
+<p>There are currently <b><%= totalPlayerCount %></b> players online on <b><%= serverCount %></b> servers. The
 servers were last checked on <%= lastChecked %>.</p>
 
 <table class="thin sortable" id="serverlist" border="1" align="center">
@@ -55,7 +59,12 @@
     </tr>
   </thead>
   <tbody>
-<%  for (ServerInfo server : servers) { %>
+<%  for (ServerInfo server : servers) {
+        // skip offline servers
+        if (!server.isOnline()) {
+            continue;
+        }
+%>
     <tr>
       <td><a href="server.jsp?id=<%= server.getId() %>"><%= server.getHostname() %></a></td>
       <td align="center">

Modified: monitor/trunk/src/main/webapp/servers-xml.jsp
===================================================================
--- monitor/trunk/src/main/webapp/servers-xml.jsp	2008-08-26 07:36:28 UTC (rev 740)
+++ monitor/trunk/src/main/webapp/servers-xml.jsp	2008-08-26 13:28:21 UTC (rev 741)
@@ -14,7 +14,12 @@
     List<ServerInfo> servers = dao.getServers();
 %>
 <tetrinet-servers>
-<%  for (ServerInfo server : servers) { %>
+<%  for (ServerInfo server : servers) {
+        // skip offline servers
+        if (!server.isOnline()) {
+            continue;
+        }
+%>
   <server
       id="<%= server.getId() %>"
       name="<%= server.getHostname() %>"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.