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

增加SLOG_ON 常量定义 默认false

Browse Source
This commit is contained in:
thinkphp
2015-12-08 16:02:57 +08:00
parent ed8741629e
commit 003b99cdd6
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
base.php
View File

@@ -13,20 +13,20 @@
define('THINK_VERSION', '5.0beta');
// 系统常量
defined('DS') or define('DS', DIRECTORY_SEPARATOR);
defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__).DS);
defined('LIB_PATH') or define('LIB_PATH', THINK_PATH.'library'.DS);
defined('MODE_PATH') or define('MODE_PATH', THINK_PATH.'mode'.DS); // 系统应用模式目录
defined('TRAIT_PATH') or define('TRAIT_PATH', THINK_PATH.'traits'.DS);
defined('CORE_PATH') or define('CORE_PATH', LIB_PATH.'think'.DS);
defined('ORG_PATH') or define('ORG_PATH', LIB_PATH . 'org'.DS);
defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']).DS);
defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__) . DS);
defined('LIB_PATH') or define('LIB_PATH', THINK_PATH . 'library' . DS);
defined('MODE_PATH') or define('MODE_PATH', THINK_PATH . 'mode' . DS); // 系统应用模式目录
defined('TRAIT_PATH') or define('TRAIT_PATH', THINK_PATH . 'traits' . DS);
defined('CORE_PATH') or define('CORE_PATH', LIB_PATH . 'think' . DS);
defined('ORG_PATH') or define('ORG_PATH', LIB_PATH . 'org' . DS);
defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . DS);
defined('COMMON_MODULE') or define('COMMON_MODULE', 'common');
defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH).DS.'runtime'.DS);
defined('DATA_PATH') or define('DATA_PATH', RUNTIME_PATH.'data'.DS);
defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH.'log'.DS);
defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH.'cache'.DS);
defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH.'temp'.DS);
defined('VENDOR_PATH') or define('VENDOR_PATH', THINK_PATH.'vendor'.DS);
defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH) . DS . 'runtime' . DS);
defined('DATA_PATH') or define('DATA_PATH', RUNTIME_PATH . 'data' . DS);
defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH . 'log' . DS);
defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH . 'cache' . DS);
defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp' . DS);
defined('VENDOR_PATH') or define('VENDOR_PATH', THINK_PATH . 'vendor' . DS);
defined('EXT') or define('EXT', '.php');
defined('MODEL_LAYER') or define('MODEL_LAYER', 'model');
defined('VIEW_LAYER') or define('VIEW_LAYER', 'view');
@@ -34,6 +34,7 @@ defined('CONTROLLER_LAYER') or define('CONTROLLER_LAYER', 'controller');
defined('APP_DEBUG') or define('APP_DEBUG', false); // 是否调试模式
defined('ENV_PREFIX') or define('ENV_PREFIX', 'T_'); // 环境变量的配置前缀
defined('IS_API') or define('IS_API', false); // 是否API接口
defined('SLOG_ON') or define('SLOG_ON', false); // 是否开启socketLog
// 应用模式 默认为普通模式
defined('APP_MODE') or define('APP_MODE', function_exists('saeAutoLoader') ? 'sae' : 'common');

18
library/think/app.php
View File

@@ -43,6 +43,11 @@ class App
// 缓存初始化
Cache::connect($config['cache']);
// 如果启动SocketLog调试， 进行SocketLog配置
if (SLOG_ON) {
\org\Slog::config($config['slog']);
}
// 默认语言
$lang = strtolower($config['default_lang']);
Lang::range($lang);
@@ -56,11 +61,6 @@ class App
if (!IS_CLI && $config['use_session']) {
Session::init($config['session']);
}
//判断，如果启动SocketLog调试， 进行SocketLog配置
if ($config['slog']['enable']) {
define('SLOG_ENABLE',true);
\org\Slog::config($config['slog']);
}
// 应用URL调度
self::dispatch($config);
@@ -275,10 +275,10 @@ class App
$depr = $config['pathinfo_depr'];
// 还原劫持后真实pathinfo
$path_info =
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
__INFO__;
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
__INFO__;
// 路由检测
if (!empty($config['url_route_on'])) {

19
library/think/error.php
View File

@@ -21,17 +21,16 @@ class Error
public static function appException($e)
{
$error = [
'message' => $e->getMessage(),
'file' => $e->getFile(),
'line' => $e->getLine(),
'trace' => $e->getTraceAsString(),
'code' => $e->getCode(),
'message' => $e->getMessage(),
'file' => $e->getFile(),
'line' => $e->getLine(),
'trace' => $e->getTraceAsString(),
'code' => $e->getCode(),
];
// 记录异常日志
Log::record($error['message'], 'ERR');
// 发送500信息
header('HTTP/1.1 500 Internal Server Error');
header('Status:500 Internal Server Error');
// 发送http状态信息
Response::sendHttpStatus(Config::get('exception_http_status'));
// 输出异常页面
self::halt($error);
}
@@ -70,7 +69,7 @@ class Error
{
// 记录日志
Log::save();
if(defined('SLOG_ENABLE') && SLOG_ENABLE) {
if (SLOG_ON) {
\org\Slog::sendLog();
}
if ($e = error_get_last()) {
@@ -99,7 +98,7 @@ class Error
{
$message = is_array($error) ? $error['message'] : $error;
$code = is_array($error) ? $error['code'] : $code;
$e = [];
$e = [];
if (APP_DEBUG) {
//调试模式下输出错误信息
if (!is_array($error)) {