Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove autologging

  • Loading branch information...
commit 61b05c40c63486dfc3ee2029f613ccc2d53873dc 1 parent 130ccf4
@dereuromark dereuromark authored
Showing with 16 additions and 30 deletions.
  1. +1 −17 lib/Cake/Log/CakeLog.php
  2. +15 −13 lib/Cake/Test/Case/Log/CakeLogTest.php
View
18 lib/Cake/Log/CakeLog.php
@@ -372,18 +372,6 @@ public static function stream($streamName) {
}
/**
- * Configures the automatic/default stream a FileLog.
- *
- * @return void
- */
- protected static function _autoConfig() {
- self::$_Collection->load('default', array(
- 'engine' => 'File',
- 'path' => LOGS,
- ));
- }
-
-/**
* Writes the given message and type to all of the configured log adapters.
* Configured adapters are passed both the $type and $message variables. $type
* is one of the following strings/values.
@@ -454,11 +442,7 @@ public static function write($type, $message, $scope = array()) {
$logged = true;
}
}
- if (!$logged) {
- self::_autoConfig();
- self::stream('default')->write($type, $message);
- }
- return true;
+ return $logged;
}
/**
View
28 lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -126,27 +126,20 @@ public function testNotImplementingInterface() {
}
/**
- * Test that CakeLog autoconfigures itself to use a FileLogger with the LOGS dir.
- * When no streams are there.
+ * Test that CakeLog does not auto create logs when no streams are there to listen.
*
* @return void
*/
- public function testAutoConfig() {
+ public function testNoStreamListenting() {
if (file_exists(LOGS . 'error.log')) {
unlink(LOGS . 'error.log');
}
- CakeLog::write(LOG_WARNING, 'Test warning');
- $this->assertTrue(file_exists(LOGS . 'error.log'));
+ $res = CakeLog::write(LOG_WARNING, 'Test warning');
+ $this->assertFalse($res);
+ $this->assertFalse(file_exists(LOGS . 'error.log'));
$result = CakeLog::configured();
- $this->assertEquals(array('default'), $result);
-
- $testMessage = 'custom message';
- CakeLog::write('custom', $testMessage);
- $content = file_get_contents(LOGS . 'custom.log');
- $this->assertContains($testMessage, $content);
- unlink(LOGS . 'error.log');
- unlink(LOGS . 'custom.log');
+ $this->assertEquals(array(), $result);
}
/**
@@ -197,6 +190,10 @@ public function testDrop() {
* @return void
*/
public function testLogFileWriting() {
+ CakeLog::config('file', array(
+ 'engine' => 'File',
+ 'path' => LOGS
+ ));
if (file_exists(LOGS . 'error.log')) {
unlink(LOGS . 'error.log');
}
@@ -503,6 +500,11 @@ public function testBogusTypeAndScope() {
$this->_resetLogConfig();
$this->_deleteLogs();
+ CakeLog::config('file', array(
+ 'engine' => 'File',
+ 'path' => LOGS
+ ));
+
CakeLog::write('bogus', 'bogus message');
$this->assertTrue(file_exists(LOGS . 'bogus.log'));
$this->assertFalse(file_exists(LOGS . 'error.log'));
Please sign in to comment.
Something went wrong with that request. Please try again.