I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

addressbook servlet cleanup

Browse Source
This commit is contained in:
zzz
2009-11-29 17:58:24 +00:00
parent 4b6989ef7b
commit d7d058e772
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
View File

@ -21,6 +21,8 @@
package net.i2p.addressbook; package net.i2p.addressbook;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Random; import java.util.Random;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
@ -39,8 +41,8 @@ import javax.servlet.http.HttpServletResponse;
* *
*/ */
public class Servlet extends HttpServlet { public class Servlet extends HttpServlet {
private Thread _thread; private Thread thread;
private String _nonce; private String nonce;
private static final String PROP_NONCE = "addressbook.nonce"; private static final String PROP_NONCE = "addressbook.nonce";
/** /**
@ -50,14 +52,17 @@ public class Servlet extends HttpServlet {
* (non-Javadoc) * (non-Javadoc)
* see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse) * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
*/ */
public void service(HttpServletRequest request, HttpServletResponse response) { public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
//System.err.println("Got request nonce = " + request.getParameter("nonce")); //System.err.println("Got request nonce = " + request.getParameter("nonce"));
if (_thread != null && request.getParameter("wakeup") != null && if (this.thread != null && request.getParameter("wakeup") != null &&
_nonce != null && _nonce.equals(request.getParameter("nonce"))) { this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
//System.err.println("Sending interrupt"); //System.err.println("Sending interrupt");
_thread.interrupt(); this.thread.interrupt();
// no output
} else {
PrintWriter out = response.getWriter();
out.write("I2P addressbook OK");
} }
// no output
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -70,15 +75,15 @@ public class Servlet extends HttpServlet {
} catch (ServletException exp) { } catch (ServletException exp) {
System.err.println("Addressbook init exception: " + exp); System.err.println("Addressbook init exception: " + exp);
} }
_nonce = "" + Math.abs((new Random()).nextLong()); this.nonce = "" + Math.abs((new Random()).nextLong());
// put the nonce where susidns can get it // put the nonce where susidns can get it
System.setProperty(PROP_NONCE, _nonce); System.setProperty(PROP_NONCE, this.nonce);
String[] args = new String[1]; String[] args = new String[1];
args[0] = config.getInitParameter("home"); args[0] = config.getInitParameter("home");
_thread = new DaemonThread(args); this.thread = new DaemonThread(args);
_thread.setDaemon(true); this.thread.setDaemon(true);
_thread.setName("Addressbook"); this.thread.setName("Addressbook");
_thread.start(); this.thread.start();
System.out.println("INFO: Starting Addressbook " + Daemon.VERSION); System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
//System.out.println("INFO: config root under " + args[0]); //System.out.println("INFO: config root under " + args[0]);
} }

2
apps/addressbook/web.xml
View File

@ -16,7 +16,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>addressbook</servlet-name> <servlet-name>addressbook</servlet-name>
<url-pattern>/</url-pattern> <url-pattern>*</url-pattern>
</servlet-mapping> </servlet-mapping>
</web-app> </web-app>