fixes after review

This commit is contained in:
zzz
2011-08-22 19:09:09 +00:00
parent 5fd7997661
commit 20c77e1529
7 changed files with 46 additions and 40 deletions

View File

@@ -201,7 +201,7 @@ public class Daemon {
} }
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
if (log != null) if (log != null)
log.append("Invalid b64 for" + key + " From: " + sub.getLocation()); log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
invalid++; invalid++;
} }
total++; total++;

View File

@@ -515,11 +515,11 @@ public class SummaryHelper extends HelperBase {
*/ */
public String getJobLag() { public String getJobLag() {
if (_context == null) if (_context == null)
return "0 ms"; return "0";
RateStat rs = _context.statManager().getRate("jobQueue.jobLag"); RateStat rs = _context.statManager().getRate("jobQueue.jobLag");
if (rs == null) if (rs == null)
return "0 ms"; return "0";
Rate lagRate = rs.getRate(60*1000); Rate lagRate = rs.getRate(60*1000);
return DataHelper.formatDuration2((long)lagRate.getAverageValue()); return DataHelper.formatDuration2((long)lagRate.getAverageValue());
} }
@@ -531,7 +531,7 @@ public class SummaryHelper extends HelperBase {
*/ */
public String getMessageDelay() { public String getMessageDelay() {
if (_context == null) if (_context == null)
return "0 ms"; return "0";
return DataHelper.formatDuration2(_context.throttle().getMessageDelay()); return DataHelper.formatDuration2(_context.throttle().getMessageDelay());
} }
@@ -543,7 +543,7 @@ public class SummaryHelper extends HelperBase {
*/ */
public String getTunnelLag() { public String getTunnelLag() {
if (_context == null) if (_context == null)
return "0 ms"; return "0";
return DataHelper.formatDuration2(_context.throttle().getTunnelLag()); return DataHelper.formatDuration2(_context.throttle().getTunnelLag());
} }

View File

@@ -36,8 +36,8 @@ public class LogConsoleBuffer {
lim = Math.max(limit, 4); lim = Math.max(limit, 4);
// Add some extra room to minimize the chance of losing a message, // Add some extra room to minimize the chance of losing a message,
// since we are doing offer() below. // since we are doing offer() below.
_buffer = new LinkedBlockingQueue(limit + 4); _buffer = new LinkedBlockingQueue(lim + 4);
_critBuffer = new LinkedBlockingQueue(limit + 4); _critBuffer = new LinkedBlockingQueue(lim + 4);
} }
void add(String msg) { void add(String msg) {

View File

@@ -1,3 +1,8 @@
* 2011-08-23 0.8.8 released
2011-08-23 zzz
* Tweaks after review
2011-08-21 zzz 2011-08-21 zzz
* RateStat: Cleanups and javadoc fixes * RateStat: Cleanups and javadoc fixes
* susimail: Fix page encoding * susimail: Fix page encoding

View File

@@ -26,7 +26,7 @@
:: lameness. :: lameness.
:: ::
cd /d %~dp0 cd /d %~dp0
find /V /I "wrapper.logfile=" wrapper.config > wrapper.new findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
move wrapper.new wrapper.config move wrapper.new wrapper.config

View File

@@ -95,6 +95,7 @@ rm -rf ./icons
rm -rf ./lib/wrapper rm -rf ./lib/wrapper
rm -f ./lib/*.dll rm -f ./lib/*.dll
rm -f ./*.bat rm -f ./*.bat
rm -f ./fix_logfile_path.cmd
rm -f ./*.exe rm -f ./*.exe
rm -rf ./installer rm -rf ./installer