[Jrobin-commits] src/org/jrobin/mrtg/server Listener.java,1.1,1.2 Server.java,1.4,1.5

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

Update of /cvsroot/jrobin/src/org/jrobin/mrtg/server
In directory sc8-pr-cvs1:/tmp/cvs-serv24108/org/jrobin/mrtg/server

Modified Files:
	Listener.java Server.java 
Log Message:
Minor changes to mrtg server app

Index: Listener.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Listener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Listener.java	9 Dec 2003 12:22:04 -0000	1.1
--- Listener.java	20 Jan 2004 10:07:50 -0000	1.2
***************
*** 30,34 ****
  import org.jrobin.mrtg.MrtgException;
  
- import java.io.IOException;
  import java.util.Date;
  import java.util.Hashtable;
--- 30,33 ----
***************
*** 38,53 ****
  	private WebServer webServer;
  
! 	Listener() throws MrtgException {
! 		start();
! 	}
! 
! 	private void start() throws MrtgException {
! 		try {
! 			webServer = new WebServer(SERVER_PORT);
! 			webServer.addHandler("mrtg", new EventHandler());
! 			Debug.print("XmlRpcServer started on port " + SERVER_PORT);
! 		} catch (IOException e) {
! 			throw new MrtgException(e);
  		}
  	}
  
--- 37,51 ----
  	private WebServer webServer;
  
! 	Listener(String[] clients) throws MrtgException {
! 		webServer = new WebServer(SERVER_PORT);
! 		webServer.addHandler("mrtg", new EventHandler());
! 		if(clients != null && clients.length > 0) {
! 			webServer.setParanoid(true);
! 			for(int i = 0; i < clients.length; i++) {
! 				webServer.acceptClient(clients[i]);
! 			}
  		}
+ 		webServer.start();
+ 		Debug.print("XmlRpcServer started on port " + SERVER_PORT);
  	}
  
***************
*** 55,65 ****
  		if(webServer != null) {
  			webServer.shutdown();
- 			/*
- 			// HACK: this takes some time - wait a few seconds before proceeding
- 			try {
- 				Thread.sleep(5000L);
- 			} catch (InterruptedException e) {
- 			}
- 			*/
  			Debug.print("XmlRpcServer closed");
  			webServer = null;
--- 53,56 ----
***************
*** 71,83 ****
  	}
  
- 	void setParanoid(String[] clients) {
- 		if(clients.length > 0 && webServer != null) {
- 			webServer.setParanoid(true);
- 			for(int i = 0; i < clients.length; i++) {
- 				webServer.acceptClient(clients[i]);
- 			}
- 		}
- 	}
- 
  	public class EventHandler {
  		public int addRouter(String host, String community, String descr, boolean active) {
--- 62,65 ----

Index: Server.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Server.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Server.java	9 Dec 2003 12:22:04 -0000	1.4
--- Server.java	20 Jan 2004 10:07:50 -0000	1.5
***************
*** 68,72 ****
  	}
  
! 	public synchronized void start() throws MrtgException {
  		if(active) {
  			throw new MrtgException("Cannot start Server, already started");
--- 68,72 ----
  	}
  
! 	public synchronized void start(String[] acceptedClients) throws MrtgException {
  		if(active) {
  			throw new MrtgException("Cannot start Server, already started");
***************
*** 82,86 ****
  		rrdWriter = new RrdWriter();
  		timer = new Timer();
! 		listener = new Listener();
  		startDate = new Date();
  		active = true;
--- 82,86 ----
  		rrdWriter = new RrdWriter();
  		timer = new Timer();
! 		listener = new Listener(acceptedClients);
  		startDate = new Date();
  		active = true;
***************
*** 193,196 ****
--- 193,199 ----
  		int retCode = deviceList.removeLink(host, ifDescr);
  		saveHardware();
+ 		// remove the underlying RRD file
+         String rrdFile = RrdWriter.getRrdFilename(host, ifDescr);
+ 		new File(rrdFile).delete();
  		return retCode;
  	}
***************
*** 242,256 ****
  	}
  
! 	public void setParanoid(String[] clients) {
! 		listener.setParanoid(clients);
! 	}
! 
! 	public static void main(String[] args) throws Exception {
          Server s = Server.getInstance();
! 		s.start();
! 		s.setParanoid(args);
! 		// this will end the server process
! 		// System.out.println("Exiting");
! 		// s.stop();
  	}
  }
--- 245,251 ----
  	}
  
! 	public static void main(String[] acceptedClients) throws Exception {
          Server s = Server.getInstance();
! 		s.start(acceptedClients);
  	}
  }