Author: michiel
Date: 2009-06-03 18:08:58 +0200 (Wed, 03 Jun 2009)
New Revision: 35638
Modified:
mmbase/trunk/src/org/mmbase/util/FileWatcher.java
mmbase/trunk/src/org/mmbase/util/ResourceLoader.java
mmbase/trunk/src/org/mmbase/util/ThreadPools.java
Log:
Details, logging, etc
Modified: mmbase/trunk/src/org/mmbase/util/FileWatcher.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/FileWatcher.java 2009-06-03 16:07:49 UTC
(rev 35637)
+++ mmbase/trunk/src/org/mmbase/util/FileWatcher.java 2009-06-03 16:08:58 UTC
(rev 35638)
@@ -84,21 +84,8 @@
static ScheduledFuture<?> future;
static FileWatcherRunner fileWatchers = new FileWatcherRunner();
static {
-
- ScheduledExecutorService scheduler;
- try {
- // to avoid depdencoy of rmmci on all threadpools
- scheduler = (ScheduledExecutorService)
Class.forName("org.mmbase.util.ThreadPools").getField("scheduler").get(null);
- } catch (Exception cnfe) {
- log.service(cnfe);
- scheduler = new ScheduledThreadPoolExecutor(1);
- }
- future = scheduler.scheduleAtFixedRate(fileWatchers, THREAD_DELAY,
THREAD_DELAY, TimeUnit.MILLISECONDS);
- try {
- Class.forName("org.mmbase.util.ThreadPools").getMethod("identify",
Future.class, String.class).invoke(null, future, "File Watcher");
- } catch (Exception cnfe) {
- // never mind
- }
+ future =
org.mmbase.util.ThreadPools.scheduler.scheduleAtFixedRate(fileWatchers,
THREAD_DELAY, THREAD_DELAY, TimeUnit.MILLISECONDS);
+ org.mmbase.util.ThreadPools.identify(future, "File Watcher");
}
Modified: mmbase/trunk/src/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/ResourceLoader.java 2009-06-03
16:07:49 UTC (rev 35637)
+++ mmbase/trunk/src/org/mmbase/util/ResourceLoader.java 2009-06-03
16:08:58 UTC (rev 35638)
@@ -1145,7 +1145,7 @@
} else {
File file = getFile(name);
if (file == null) return
NOT_AVAILABLE_URLSTREAM_HANDLER.openConnection(name);
- u = new URL(null, "file:" + file, this);
+ u = new URL(null, "file://" + file, this);
}
} catch (MalformedURLException mfue) {
throw new AssertionError(mfue.getMessage());
@@ -1752,7 +1752,7 @@
@Override protected Map.Entry<String, String>
getEntry(org.mmbase.util.xml.DocumentReader reader, String key, String value) {
String u = reader.getDocument().getDocumentURI();
String[] parts = u.split("!", 2);
- log.info(u + "-> " + Arrays.asList(parts));
+ log.debug(u + "-> " + Arrays.asList(parts));
if (parts.length == 2) {
if (key.startsWith("!")) {
key = "\\A" +
ReplacingLocalizedString.makeLiteral(parts[0]) + key + "\\z"; // should escape
'.' and so one.
@@ -2015,7 +2015,7 @@
}
}
*/
- if (log.isDebugEnabled()) {
+ if (log != null && log.isDebugEnabled()) {
log.debug("Returning " + results);
}
return results;
Modified: mmbase/trunk/src/org/mmbase/util/ThreadPools.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/ThreadPools.java 2009-06-03 16:07:49 UTC
(rev 35637)
+++ mmbase/trunk/src/org/mmbase/util/ThreadPools.java 2009-06-03 16:08:58 UTC
(rev 35638)
@@ -80,8 +80,10 @@
@Override public void run() {
try {
super.run();
- } catch (Throwable t) {
- log.error("Error during job: " + r + ":" + id + " " +
t.getClass().getName() + " " + t.getMessage(), t);
+ } catch (org.mmbase.bridge.NotFoundException nf) {
+ log.debug("Error during job: " + r + ":" + id + " " +
nf.getClass().getName() + " " + nf.getMessage(), nf);
+ } catch (Throwable e) {
+ log.error("Error during job: " + r + ":" + id + " " +
e.getClass().getName() + " " + e.getMessage(), e);
}
}
};
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
