Author: toad
Date: 2009-03-20 23:19:56 +0000 (Fri, 20 Mar 2009)
New Revision: 26131
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Use the new logging infrastructure
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-20 23:17:29 UTC (rev 26130)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-20 23:19:56 UTC (rev 26131)
@@ -31,14 +31,27 @@
import freenet.keys.BaseClientKey;
import freenet.keys.FreenetURI;
import freenet.node.RequestClient;
+import freenet.support.LogThresholdCallback;
import freenet.support.Logger;
import freenet.support.api.Bucket;
import freenet.support.io.BucketTools;
import freenet.support.io.NativeThread;
public class SimpleManifestPutter extends BaseClientPutter implements
PutCompletionCallback {
+
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback() {
+
+ @Override
+ public void shouldUpdate() {
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
+
// Only implements PutCompletionCallback for the final metadata insert
-
private class PutHandler extends BaseClientPutter implements
PutCompletionCallback {
protected PutHandler(final SimpleManifestPutter smp, String
name, Bucket data, ClientMetadata cm, boolean getCHKOnly) {
@@ -140,7 +153,6 @@
}
public void onSuccess(ClientPutState state, ObjectContainer
container, ClientContext context) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Completed "+this);
if(persistent) {
container.activate(SimpleManifestPutter.this,
1);
@@ -234,7 +246,6 @@
} else if(state != null && persistent) {
state.removeFrom(container, context);
}
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Failed: "+this+" -
"+e, e);
if(persistent)
container.activate(SimpleManifestPutter.this,
1);
@@ -282,7 +293,6 @@
}
public void onMetadata(Metadata m, ClientPutState state,
ObjectContainer container, ClientContext context) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Assigning metadata:
"+m+" for "+this+" from "+state+" persistent="+persistent,
new Exception("debug"));
if(metadata != null) {
@@ -476,7 +486,6 @@
}
- static boolean logMINOR;
private HashMap<String,Object> putHandlersByName;
private HashSet<PutHandler> runningPutHandlers;
private HashSet<PutHandler> putHandlersWaitingForMetadata;
@@ -509,7 +518,6 @@
HashMap manifestElements, short prioClass, FreenetURI
target,
String defaultName, InsertContext ctx, boolean
getCHKOnly, RequestClient clientContext, boolean earlyEncode) {
super(prioClass, clientContext);
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.defaultName = defaultName;
if(client.persistent())
this.targetURI = target.clone();
@@ -537,7 +545,6 @@
}
public void start(ObjectContainer container, ClientContext context)
throws InsertException {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if (logMINOR)
Logger.minor(this, "Starting " + this+"
persistence="+persistent());
PutHandler[] running;
@@ -1153,7 +1160,6 @@
* @param putHandlersByName
*/
private void removePutHandlersByName(ObjectContainer container,
ClientContext context, HashMap<String, Object> putHandlersByName) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "removePutHandlersByName on
"+this+" : map size = "+putHandlersByName.size());
for(Map.Entry<String, Object> entry :
putHandlersByName.entrySet()) {
String key = entry.getKey();
@@ -1215,7 +1221,6 @@
}
public void onSuccess(ClientPutState state, ObjectContainer container,
ClientContext context) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(persistent()) {
container.activate(metadataPuttersByMetadata, 2);
}
@@ -1257,7 +1262,6 @@
}
public void onFailure(InsertException e, ClientPutState state,
ObjectContainer container, ClientContext context) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
fail(e, container, context);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
