top-think / framework

library/think/log/driver/File.php

Spacing +21 added lines, -21 removed lines

@@ -40,7 +40,7 @@ 
         }
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $this->app->getRuntimePath() . 'log' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $this->app->getRuntimePath().'log'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -69,7 +69,7 @@ 
                     $msg = var_export($msg, true);
                 }
 
-                $info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
+                $info[$type][] = $this->config['json'] ? $msg : '[ '.$type.' ] '.$msg;
             }
 
             if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
@@ -136,7 +136,7 @@ 
     protected function getMasterLogFile()
     {
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = glob($this->config['path'].'*.log');
 
             try {
                 if (count($files) > $this->config['max_files']) {
@@ -151,15 +151,15 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $destination = $this->config['path'] . $name . $cli . '.log';
+            $destination = $this->config['path'].$name.$cli.'.log';
         } else {
             if ($this->config['max_files']) {
-                $filename = date('Ymd') . $cli . '.log';
+                $filename = date('Ymd').$cli.'.log';
             } else {
-                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log';
+                $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').$cli.'.log';
             }
 
-            $destination = $this->config['path'] . $filename;
+            $destination = $this->config['path'].$filename;
         }
 
         return $destination;
@@ -184,7 +184,7 @@ 
             $name = date('d');
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '_' . $type . $cli . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'_'.$type.$cli.'.log';
     }
 
     /**
@@ -197,7 +197,7 @@ 
     {
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
             try {
-                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+                rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination));
             } catch (\Exception $e) {
             }
         }
@@ -212,14 +212,14 @@ 
     protected function parseCliLog($info)
     {
         if ($this->config['json']) {
-            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         } else {
             $now = $info['timestamp'];
             unset($info['timestamp']);
 
             $message = implode(PHP_EOL, $info);
 
-            $message = "[{$now}]" . $message . PHP_EOL;
+            $message = "[{$now}]".$message.PHP_EOL;
         }
 
         return $message;
@@ -242,13 +242,13 @@ 
 
         if ($this->config['json']) {
             $info = $requestInfo + $info;
-            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         }
 
-        array_unshift($info, "---------------------------------------------------------------" . PHP_EOL . "\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        array_unshift($info, "---------------------------------------------------------------".PHP_EOL."\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
         unset($info['timestamp']);
 
-        return implode(PHP_EOL, $info) . PHP_EOL;
+        return implode(PHP_EOL, $info).PHP_EOL;
     }
 
     protected function getDebugLog(&$info, $append, $apart)
@@ -263,9 +263,9 @@ 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
                 $info = [
-                    'runtime' => number_format($runtime, 6) . 's',
-                    'reqs'    => $reqs . 'req/s',
-                    'memory'  => $memory_use . 'kb',
+                    'runtime' => number_format($runtime, 6).'s',
+                    'reqs'    => $reqs.'req/s',
+                    'memory'  => $memory_use.'kb',
                     'file'    => count(get_included_files()),
                 ] + $info;
 
@@ -276,11 +276,11 @@ 
 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
-                $time_str   = '[运行时间：' . number_format($runtime, 6) . 's] [吞吐率：' . $reqs . 'req/s]';
-                $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
-                $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+                $time_str   = '[运行时间：'.number_format($runtime, 6).'s] [吞吐率：'.$reqs.'req/s]';
+                $memory_str = ' [内存消耗：'.$memory_use.'kb]';
+                $file_load  = ' [文件加载：'.count(get_included_files()).']';
 
-                array_unshift($info, $time_str . $memory_str . $file_load);
+                array_unshift($info, $time_str.$memory_str.$file_load);
             }
         }
     }