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

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

Revision: 776
          http://jetrix.svn.sourceforge.net/jetrix/?rev=776&view=rev
Author:   smanux
Date:     2008-11-16 21:27:36 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
Flush the SQL database once the RRD file is updated

Modified Paths:
--------------
    monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerStatsDao.java
    monitor/trunk/src/main/java/net/jetrix/monitor/job/GraphGenerationJob.java

Modified: monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerStatsDao.java
===================================================================
--- monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerStatsDao.java	2008-11-16 21:24:58 UTC (rev 775)
+++ monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerStatsDao.java	2008-11-16 21:27:36 UTC (rev 776)
@@ -20,6 +20,7 @@
 package net.jetrix.monitor.dao;
 
 import java.util.List;
+import java.util.Date;
 
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -44,4 +45,19 @@
     {
         getSession().saveOrUpdate(stats);
     }
+
+    /**
+     * Delete the server stats up to the specified date.
+     * 
+     * @param serverId
+     * @param date
+     */
+    public void delete(long serverId, Date date)
+    {
+        Query query = getSession().createQuery("DELETE FROM ServerStats WHERE serverId=:id AND date <= :date");
+        query.setParameter("id", serverId);
+        query.setParameter("date", date);
+        
+        query.executeUpdate();
+    }
 }

Modified: monitor/trunk/src/main/java/net/jetrix/monitor/job/GraphGenerationJob.java
===================================================================
--- monitor/trunk/src/main/java/net/jetrix/monitor/job/GraphGenerationJob.java	2008-11-16 21:24:58 UTC (rev 775)
+++ monitor/trunk/src/main/java/net/jetrix/monitor/job/GraphGenerationJob.java	2008-11-16 21:27:36 UTC (rev 776)
@@ -45,6 +45,8 @@
 import net.jetrix.monitor.dao.ServerStatsDao;
 
 /**
+ * Job updating the graphs.
+ * 
  * @author Emmanuel Bourg
  * @version $Revision$, $Date$
  */
@@ -52,7 +54,10 @@
 {
     public static final String DEFAULT_DATAPATH = System.getProperty("user.home") + "/.jetrix";
 
+    /** The directory where the RRD files are stored. */
     private String dataPath = DEFAULT_DATAPATH;
+    
+    /** The directory where the images are generated. */
     private String outpoutPath = DEFAULT_DATAPATH;
 
     public void setDataPath(String dataPath)
@@ -85,6 +90,15 @@
             {
                 List<ServerStats> stats = serverStatsDao.getStats(server.getId());
                 generateGraph(server, stats);
+
+                /**
+                 * Remove the stats from the SQL database
+                 */
+                if (!stats.isEmpty())
+                {
+                    ServerStats lastStats = stats.get(stats.size() - 1);
+                    serverStatsDao.delete(server.getId(), lastStats.getDate());
+                }
             }
             catch (Exception e)
             {
@@ -100,7 +114,7 @@
 
     protected void generateGraph(ServerInfo server, List<ServerStats> stats) throws RrdException, IOException
     {
-        boolean update= updateDatabase(server,stats);
+        boolean update= updateDatabase(server, stats);
         if (update)
         {
             generateGraph(server, 1);
@@ -156,7 +170,7 @@
 
         def.addDatasource("players", "GAUGE", 600, 0, Double.NaN);
         def.addDatasource("activePlayers", "GAUGE", 600, 0, Double.NaN);
-        def.addArchive("AVERAGE", 0.5, 1, 1000000);
+        def.addArchive("AVERAGE", 0.5, 1, 500000);
 
         RrdDb rrdDb = new RrdDb(def);
         rrdDb.close();


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