@@ -158,8 +158,14 @@ protected function setValue($key, $value, $duration)
158
158
return @touch ($ cacheFile , $ duration + time ());
159
159
}
160
160
161
- $ error = error_get_last ();
162
- Yii::warning ("Unable to write cache file ' {$ cacheFile }': {$ error ['message ' ]}" , __METHOD__ );
161
+ $ message = "Unable to write cache file ' {$ cacheFile }' " ;
162
+
163
+ if ($ error = error_get_last ()) {
164
+ $ message .= ": {$ error ['message ' ]}" ;
165
+ }
166
+
167
+ Yii::warning ($ message , __METHOD__ );
168
+
163
169
return false ;
164
170
}
165
171
@@ -265,20 +271,26 @@ protected function gcRecursive($path, $expiredOnly)
265
271
continue ;
266
272
}
267
273
$ fullPath = $ path . DIRECTORY_SEPARATOR . $ file ;
274
+ $ message = null ;
268
275
if (is_dir ($ fullPath )) {
269
276
$ this ->gcRecursive ($ fullPath , $ expiredOnly );
270
277
if (!$ expiredOnly ) {
271
278
if (!@rmdir ($ fullPath )) {
272
- $ error = error_get_last ();
273
- Yii::warning ("Unable to remove directory ' {$ fullPath }': {$ error ['message ' ]}" , __METHOD__ );
279
+ $ message = "Unable to remove directory ' $ fullPath' " ;
280
+ if ($ error = error_get_last ()) {
281
+ $ message .= ": {$ error ['message ' ]}" ;
282
+ }
274
283
}
275
284
}
276
285
} elseif (!$ expiredOnly || $ expiredOnly && @filemtime ($ fullPath ) < time ()) {
277
286
if (!@unlink ($ fullPath )) {
278
- $ error = error_get_last ();
279
- Yii::warning ("Unable to remove file ' {$ fullPath }': {$ error ['message ' ]}" , __METHOD__ );
287
+ $ message = "Unable to remove file ' $ fullPath' " ;
288
+ if ($ error = error_get_last ()) {
289
+ $ message .= ": {$ error ['message ' ]}" ;
290
+ }
280
291
}
281
292
}
293
+ $ message and Yii::warning ($ message , __METHOD__ );
282
294
}
283
295
closedir ($ handle );
284
296
}
0 commit comments