[Jrobin-commits] src/org/jrobin/mrtg/server Plotter.java,1.2,1.3 Server.java,1.8,1.9 Timer.java,1.1,1.2

[<sa...@us...>]

Update of /cvsroot/jrobin/src/org/jrobin/mrtg/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27547/org/jrobin/mrtg/server

Modified Files:
	Plotter.java Server.java Timer.java 
Log Message:
RrdDbPool final tweaks 

Index: Plotter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Plotter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Plotter.java	8 Mar 2004 13:14:39 -0000	1.2
--- Plotter.java	11 Mar 2004 13:54:26 -0000	1.3
***************
*** 91,96 ****
  			}
  		}
! 		RrdGraph graph = new RrdGraph(true); // use pool
! 		graph.setGraphDef(rrdGraphDef);
  		return graph;
  	}
--- 91,95 ----
  			}
  		}
! 		RrdGraph graph = new RrdGraph(rrdGraphDef, true); // use pool
  		return graph;
  	}

Index: Server.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Server.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Server.java	8 Mar 2004 13:14:39 -0000	1.8
--- Server.java	11 Mar 2004 13:54:26 -0000	1.9
***************
*** 26,29 ****
--- 26,30 ----
  
  import org.jrobin.core.RrdDb;
+ import org.jrobin.core.RrdDbPool;
  import org.jrobin.mrtg.MrtgException;
  import org.jrobin.mrtg.MrtgConstants;
***************
*** 68,72 ****
  	private Server() {
  		RrdDb.setLockMode(RrdDb.NO_LOCKS);
! 		//RrdDbPool.getInstance().setCapacity(500);
  	}
  
--- 69,73 ----
  	private Server() {
  		RrdDb.setLockMode(RrdDb.NO_LOCKS);
! 		RrdDbPool.getInstance().setCapacity(POOL_CAPACITY);
  	}
  

Index: Timer.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Timer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Timer.java	9 Dec 2003 12:22:04 -0000	1.1
--- Timer.java	11 Mar 2004 13:54:26 -0000	1.2
***************
*** 51,54 ****
--- 51,59 ----
  						link.isDue() && !link.isSampling()) {
  						new SnmpReader(router, link).start();
+ 						try {
+ 							sleep(SCHEDULER_DELAY);
+ 						} catch (InterruptedException e) {
+ 							e.printStackTrace();
+ 						}
  					}
  				}