From 5bd488d116cfb3c36fb4d2c162d4c4bbceefe300 Mon Sep 17 00:00:00 2001 From: welefen Date: Sun, 1 Jun 2014 13:58:10 +0800 Subject: [PATCH] =?UTF-8?q?Cache=E5=92=8CSession=E7=9A=84rm=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E9=83=BD=E8=BF=94=E5=9B=9EPromise?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/Lib/Driver/Cache/FileCache.js | 7 ++++++- lib/Lib/Driver/Session/DbSession.js | 1 + lib/Lib/Util/Cache.js | 1 + package.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/Lib/Driver/Cache/FileCache.js b/lib/Lib/Driver/Cache/FileCache.js index f75474ea..81390337 100644 --- a/lib/Lib/Driver/Cache/FileCache.js +++ b/lib/Lib/Driver/Cache/FileCache.js @@ -106,8 +106,13 @@ module.exports = Cache(function(){ rm: function(name){ var filePath = this.getStoredFile(name); if (isFile(filePath)) { - fs.unlink(filePath, function(){}); + var deferred = getDefer(); + fs.unlink(filePath, function(){ + deferred.resolve(); + }) + return deferred.promise; } + return getPromise(); }, /** * gc diff --git a/lib/Lib/Driver/Session/DbSession.js b/lib/Lib/Driver/Session/DbSession.js index 75746275..e56f13b6 100644 --- a/lib/Lib/Driver/Session/DbSession.js +++ b/lib/Lib/Driver/Session/DbSession.js @@ -88,6 +88,7 @@ module.exports = Cache(function(){ if (this.data) { delete this.data[name]; } + return getPromise(); }, /** * 将数据保存到数据库中 diff --git a/lib/Lib/Util/Cache.js b/lib/Lib/Util/Cache.js index 4bd0fd69..6843efcb 100644 --- a/lib/Lib/Util/Cache.js +++ b/lib/Lib/Util/Cache.js @@ -118,6 +118,7 @@ module.exports = Class(function(){ if (key in this.cacheData) { delete this.cacheData[key].data[name]; } + return getPromise(); }, /** * gc diff --git a/package.json b/package.json index b7f57b58..7bbfc200 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "thinkjs", "description": "A MVC Web Framework For Node.js", - "version": "0.5.28", + "version": "0.5.29", "author": { "name": "welefen", "email": "welefen@gmail.com"