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

部署模式下简化日志记录

Browse Source
This commit is contained in:
thinkphp
2016-12-01 18:32:28 +08:00
parent b62175c34d
commit 4a80099a51
3 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Log.php
View File

@@ -184,7 +184,7 @@ class Log
self::init(Config::get('log')); self::init(Config::get('log'));
} }
// 写入日志 // 写入日志
return self::$driver->save($log); return self::$driver->save($log, false);
} }
/** /**

52
library/think/log/driver/File.php
View File

@@ -11,6 +11,8 @@
namespace think\log\driver; namespace think\log\driver;
use think\App;
/** /**
* 本地化调试输出到文件 * 本地化调试输出到文件
*/ */
@@ -35,9 +37,10 @@ class File
* 日志写入接口 * 日志写入接口
* @access public * @access public
* @param array $log 日志信息 * @param array $log 日志信息
* @param bool $depr 是否写入分割线
* @return bool * @return bool
*/ */
public function save(array $log = []) public function save(array $log = [], $depr = true)
{ {
$now = date($this->config['time_format']); $now = date($this->config['time_format']);
$destination = $this->config['path'] . date('Ym') . DS . date('d') . '.log'; $destination = $this->config['path'] . date('Ym') . DS . date('d') . '.log';
@@ -50,25 +53,29 @@ class File
rename($destination, dirname($destination) . DS . $_SERVER['REQUEST_TIME'] . '-' . basename($destination)); rename($destination, dirname($destination) . DS . $_SERVER['REQUEST_TIME'] . '-' . basename($destination));
} }
// 获取基本信息 $depr = $depr ? "---------------------------------------------------------------\r\n" : '';
if (isset($_SERVER['HTTP_HOST'])) {
$current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; if (App::$debug) {
} else { // 获取基本信息
$current_uri = "cmd:" . implode(' ', $_SERVER['argv']); if (isset($_SERVER['HTTP_HOST'])) {
$current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
} else {
$current_uri = "cmd:" . implode(' ', $_SERVER['argv']);
}
$runtime = number_format(microtime(true) - THINK_START_TIME, 10);
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$time_str = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$memory_str = ' [内存消耗：' . $memory_use . 'kb]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']';
$info = '[ log ] ' . $current_uri . $time_str . $memory_str . $file_load . "\r\n";
$server = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0';
$remote = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'CLI';
$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
} }
$runtime = number_format(microtime(true) - THINK_START_TIME, 10);
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$time_str = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$memory_str = ' [内存消耗：' . $memory_use . 'kb]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']';
$info = '[ log ] ' . $current_uri . $time_str . $memory_str . $file_load . "\r\n";
$server = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0';
$remote = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'CLI';
$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
foreach ($log as $type => $val) { foreach ($log as $type => $val) {
$level = ''; $level = '';
foreach ($val as $msg) { foreach ($val as $msg) {
@@ -80,12 +87,15 @@ class File
if (in_array($type, $this->config['apart_level'])) { if (in_array($type, $this->config['apart_level'])) {
// 独立记录的日志级别 // 独立记录的日志级别
$filename = $path . DS . date('d') . '_' . $type . '.log'; $filename = $path . DS . date('d') . '_' . $type . '.log';
error_log("[{$now}] {$server} {$remote} {$method} {$uri}\r\n{$level}\r\n---------------------------------------------------------------\r\n", 3, $filename); error_log("[{$now}] {$level}\r\n{$depr}", 3, $filename);
} else { } else {
$info .= $level; $info .= $level;
} }
} }
return error_log("[{$now}] {$server} {$remote} {$method} {$uri}\r\n{$info}\r\n---------------------------------------------------------------\r\n", 3, $destination); if (App::$debug) {
$info = "{$server} {$remote} {$method} {$uri}\r\n" . $info;
}
return error_log("[{$now}] {$info}\r\n{$depr}", 3, $destination);
} }
} }

35
library/think/log/driver/Socket.php
View File

@@ -63,24 +63,27 @@ class Socket
if (!$this->check()) { if (!$this->check()) {
return false; return false;
} }
$runtime = number_format(microtime(true) - THINK_START_TIME, 10); $trace = [];
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞'; if (App::$debug) {
$time_str = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]'; $runtime = number_format(microtime(true) - THINK_START_TIME, 10);
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$memory_str = ' [内存消耗：' . $memory_use . 'kb]'; $time_str = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']'; $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$memory_str = ' [内存消耗：' . $memory_use . 'kb]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']';
if (isset($_SERVER['HTTP_HOST'])) { if (isset($_SERVER['HTTP_HOST'])) {
$current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
} else { } else {
$current_uri = 'cmd:' . implode(' ', $_SERVER['argv']); $current_uri = 'cmd:' . implode(' ', $_SERVER['argv']);
}
// 基本信息
$trace[] = [
'type' => 'group',
'msg' => $current_uri . $time_str . $memory_str . $file_load,
'css' => $this->css['page'],
];
} }
// 基本信息
$trace[] = [
'type' => 'group',
'msg' => $current_uri . $time_str . $memory_str . $file_load,
'css' => $this->css['page'],
];
foreach ($log as $type => $val) { foreach ($log as $type => $val) {
$trace[] = [ $trace[] = [