marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better error messages, fix NPE, comment out template handling

Browse Source
This commit is contained in:
zzz
2011-03-17 16:16:50 +00:00
parent ef26accde0
commit 2e5e3b9d40
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/routerconsole/jsp/viewstat.jsp
View File

@@ -8,17 +8,21 @@
*/ */
boolean rendered = false; boolean rendered = false;
/**** unused
String templateFile = request.getParameter("template"); String templateFile = request.getParameter("template");
if (templateFile != null) { if (templateFile != null) {
java.io.OutputStream cout = response.getOutputStream(); java.io.OutputStream cout = response.getOutputStream();
response.setContentType("image/png"); response.setContentType("image/png");
rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(cout, templateFile); rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(cout, templateFile);
} }
****/
net.i2p.stat.Rate rate = null; net.i2p.stat.Rate rate = null;
String stat = request.getParameter("stat"); String stat = request.getParameter("stat");
String period = request.getParameter("period"); String period = request.getParameter("period");
boolean fakeBw = (stat != null && ("bw.combined".equals(stat))); boolean fakeBw = (stat != null && ("bw.combined".equals(stat)));
net.i2p.stat.RateStat rs = net.i2p.I2PAppContext.getGlobalContext().statManager().getRate(stat); net.i2p.stat.RateStat rs = null;
if (stat != null)
rs = net.i2p.I2PAppContext.getGlobalContext().statManager().getRate(stat);
if ( !rendered && ((rs != null) || fakeBw) ) { if ( !rendered && ((rs != null) || fakeBw) ) {
long per = -1; long per = -1;
try { try {
@@ -71,6 +75,9 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
* a huge load for a page full of graphs if there's a problem * a huge load for a page full of graphs if there's a problem
*/ */
if (!rendered) { if (!rendered) {
response.sendError(403, "That stat is not available"); if (stat != null)
response.sendError(403, "The stat " + stat + " is not available, it must be enabled for graphing on the stats configuration page.");
else
response.sendError(403, "No stat specified");
} }
%> %>