[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/log LogManager.java, 1.3, 1.4

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14405/src/edu/harvard/syrah/pyxida/log

Modified Files:
	LogManager.java 
Log Message:
Improved Pyxida node webpage

Index: LogManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/LogManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogManager.java	15 Feb 2007 18:01:26 -0000	1.3
--- LogManager.java	21 Feb 2007 13:10:29 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.pyxida.nc.NCManager;
+ import edu.harvard.syrah.pyxida.ping.PingManager;
  import edu.harvard.syrah.sbon.async.*;
  import edu.harvard.syrah.sbon.async.CBResult.CBState;
***************
*** 20,32 ****
  	static final long ERROR_RETRY_INTERVAL = Long.valueOf(Config.getProperty("pyxida.logserver.error_interval", "600000"));
  	
  	private ObjCommIF comm;
  	private NCManager ncManager;
  		
! 	public LogManager(ObjCommIF objComm, NCManager ncManager) {
  		this.comm = objComm;
  		this.ncManager = ncManager;
  	}
  	
  	public void init(final CB0 cb0) {
  		if (LOG_SERVER_HOSTNAME == null) {
  			log.debug("Not logging to log server");
--- 21,48 ----
  	static final long ERROR_RETRY_INTERVAL = Long.valueOf(Config.getProperty("pyxida.logserver.error_interval", "600000"));
  	
+ 	public static final long STATS_PERIOD = Long.parseLong(Config.getConfigProps().getProperty("pyxida.stats_period", "600000"));  
+ 	
  	private ObjCommIF comm;
  	private NCManager ncManager;
+ 	private PingManager pingManager;
+ 	
+ 	final CB0 statCB;
  		
! 	public LogManager(ObjCommIF objComm, NCManager ncManager, PingManager pingManager) {
  		this.comm = objComm;
  		this.ncManager = ncManager;
+ 		this.pingManager = pingManager;
+ 		
+ 		statCB = new CB0() {
+ 			protected void cb(CBResult result) {
+ 				printStats();
+ 				registerStatsTimer();
+ 			}
+ 		};
  	}
  	
  	public void init(final CB0 cb0) {
+ 		registerStatsTimer();		
+ 		
  		if (LOG_SERVER_HOSTNAME == null) {
  			log.debug("Not logging to log server");
***************
*** 45,48 ****
--- 61,73 ----
  		});
  	}
+ 
+ 	void printStats() {
+ 		ncManager.printStats();
+ 		pingManager.printStats();
+ 	}
+ 
+ 	void registerStatsTimer () {
+ 		EventLoop.get().registerTimerCB(STATS_PERIOD, statCB);
+ 	}
  }