From: <fg...@us...> - 2011-04-27 12:28:56
|
Revision: 3429 http://openutils.svn.sourceforge.net/openutils/?rev=3429&view=rev Author: fgiust Date: 2011-04-27 12:28:50 +0000 (Wed, 27 Apr 2011) Log Message: ----------- avoid locks by renaming the dir before deleting Modified Paths: -------------- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java =================================================================== --- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-04-22 13:18:31 UTC (rev 3428) +++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-04-27 12:28:50 UTC (rev 3429) @@ -452,19 +452,27 @@ try { - // wait that every rw operation finished - for (String key : contents.keySet()) - { - contents.get(key).waitForWritingLock(); - } + final File cacheDir = new File(getCacheDir()); contents.clear(); // remove cache folder - File cacheDir = new File(getCacheDir()); if (cacheDir.exists()) { - cacheDir.delete(); + cacheDir.renameTo(new File(cacheDir.getParentFile(), "deleted." + System.currentTimeMillis())); + + new Thread() + { + + /** + * {@inheritDoc} + */ + @Override + public void run() + { + cacheDir.delete(); + } + }.start(); } } finally This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2011-04-27 13:42:14
|
Revision: 3441 http://openutils.svn.sourceforge.net/openutils/?rev=3441&view=rev Author: fgiust Date: 2011-04-27 13:42:04 +0000 (Wed, 27 Apr 2011) Log Message: ----------- added log Modified Paths: -------------- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java =================================================================== --- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-04-27 13:05:15 UTC (rev 3440) +++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-04-27 13:42:04 UTC (rev 3441) @@ -448,6 +448,7 @@ */ public void flush() { + log.info("Flushing cache"); active = false; try @@ -478,6 +479,7 @@ finally { active = true; + log.info("Cache restarted"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2011-06-07 11:32:22
|
Revision: 3513 http://openutils.svn.sourceforge.net/openutils/?rev=3513&view=rev Author: fgiust Date: 2011-06-07 11:32:11 +0000 (Tue, 07 Jun 2011) Log Message: ----------- logging Modified Paths: -------------- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java =================================================================== --- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-06 17:24:41 UTC (rev 3512) +++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:32:11 UTC (rev 3513) @@ -471,7 +471,16 @@ @Override public void run() { - cacheDir.delete(); + log.info("Deleting stale cache dir {}", cacheDir.getAbsolutePath()); + boolean deleted = cacheDir.delete(); + if (deleted) + { + log.info("Cache dir {} successfully deleted", cacheDir.getAbsolutePath()); + } + else + { + log.info("Unable to delete cache dir {}", cacheDir.getAbsolutePath()); + } } }.start(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2011-06-07 11:34:07
|
Revision: 3514 http://openutils.svn.sourceforge.net/openutils/?rev=3514&view=rev Author: fgiust Date: 2011-06-07 11:34:01 +0000 (Tue, 07 Jun 2011) Log Message: ----------- renaming of old directory Modified Paths: -------------- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java =================================================================== --- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:32:11 UTC (rev 3513) +++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:34:01 UTC (rev 3514) @@ -460,8 +460,10 @@ // remove cache folder if (cacheDir.exists()) { - cacheDir.renameTo(new File(cacheDir.getParentFile(), "deleted." + System.currentTimeMillis())); + final File renamedDir = new File(cacheDir.getParentFile(), "deleted." + System.currentTimeMillis()); + cacheDir.renameTo(renamedDir); + new Thread() { @@ -472,7 +474,7 @@ public void run() { log.info("Deleting stale cache dir {}", cacheDir.getAbsolutePath()); - boolean deleted = cacheDir.delete(); + boolean deleted = renamedDir.delete(); if (deleted) { log.info("Cache dir {} successfully deleted", cacheDir.getAbsolutePath()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2011-06-13 15:57:50
|
Revision: 3535 http://openutils.svn.sourceforge.net/openutils/?rev=3535&view=rev Author: fgiust Date: 2011-06-13 15:57:39 +0000 (Mon, 13 Jun 2011) Log Message: ----------- better log, print out renamed dir while deleting Modified Paths: -------------- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java =================================================================== --- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-13 14:28:05 UTC (rev 3534) +++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-13 15:57:39 UTC (rev 3535) @@ -480,16 +480,16 @@ @Override public void run() { - log.info("Deleting stale cache dir {}", cacheDir.getAbsolutePath()); + log.info("Deleting stale cache dir {}", renamedDir.getAbsolutePath()); try { FileUtils.deleteDirectory(renamedDir); - log.info("Cache dir {} successfully deleted", cacheDir.getAbsolutePath()); + log.info("Cache dir {} successfully deleted", renamedDir.getAbsolutePath()); } catch (IOException e) { - log.info("Unable to delete cache dir {}", cacheDir.getAbsolutePath()); + log.info("Unable to delete cache dir {}", renamedDir.getAbsolutePath()); } } }.start(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |