mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

日志初始化改进

Browse Source
This commit is contained in:
thinkphp
2016-02-02 15:43:22 +08:00
parent 27cc3d524a
commit 9ea738ee26
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/App.php
View File

@@ -74,6 +74,9 @@ class App
Session::init($config['session']); Session::init($config['session']);
} }
// 日志初始化
Log::init($config['log']);
if (empty(self::$dispatch['type'])) { if (empty(self::$dispatch['type'])) {
// 未指定调度类型 则进行URL路由检测 // 未指定调度类型 则进行URL路由检测
self::route($config); self::route($config);

6
library/think/Log.php
View File

@@ -80,9 +80,6 @@ class Log
*/ */
public static function save() public static function save()
{ {
if (is_null(self::$driver)) {
self::init(Config::get('log'));
}
self::$driver->save(self::$log); self::$driver->save(self::$log);
} }
@@ -102,9 +99,6 @@ class Log
// 监听log_write // 监听log_write
APP_HOOK && Hook::listen('log_write', $log); APP_HOOK && Hook::listen('log_write', $log);
if (is_null(self::$driver)) {
self::init(Config::get('log'));
}
// 写入日志 // 写入日志
self::$driver->save($log); self::$driver->save($log);
} }

2
tests/thinkphp/library/think/inputTest.php
View File

@@ -174,7 +174,7 @@ class inputTest extends \PHPUnit_Framework_TestCase
//$path = $_SERVER['PATH_INFO'] ? explode('/', $_SERVER['PATH_INFO'])[0] : ''; //$path = $_SERVER['PATH_INFO'] ? explode('/', $_SERVER['PATH_INFO'])[0] : '';
//$this->assertEquals($path, Input::path('0', '')); //$this->assertEquals($path, Input::path('0', ''));
$_FILES = ['file' => ['name' => 'test.png', 'type' => 'image/png', 'tmp_name' => '/tmp/php5Wx0aJ', 'error' => 0, size => 15726]]; $_FILES = ['file' => ['name' => 'test.png', 'type' => 'image/png', 'tmp_name' => '/tmp/php5Wx0aJ', 'error' => 0, 'size' => 15726]];
$this->assertEquals('image/png', Input::file('file.type')); $this->assertEquals('image/png', Input::file('file.type'));
} }