Merge branch 'master' into develop
This commit is contained in:
commit
abff7d8e7d
|
@ -171,9 +171,9 @@
|
||||||
|
|
||||||
if (Request::cli())
|
if (Request::cli())
|
||||||
{
|
{
|
||||||
$environment = get_cli_option('env');
|
$environment = get_cli_option('env', getenv('LARAVEL_ENV'));
|
||||||
|
|
||||||
if ( ! isset($environment))
|
if (empty($environment))
|
||||||
{
|
{
|
||||||
$environment = Request::detect_env($environments, gethostname());
|
$environment = Request::detect_env($environments, gethostname());
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,14 +33,21 @@ protected static function exception_line($e)
|
||||||
*
|
*
|
||||||
* // Write an "error" message using the class' magic method
|
* // Write an "error" message using the class' magic method
|
||||||
* Log::error('Something went horribly wrong!');
|
* Log::error('Something went horribly wrong!');
|
||||||
|
*
|
||||||
|
* // Log an arrays data
|
||||||
|
* Log::write('info', array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
|
||||||
|
* //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
|
||||||
|
* //If we had omit the third parameter the result had been: Array
|
||||||
* </code>
|
* </code>
|
||||||
*
|
*
|
||||||
* @param string $type
|
* @param string $type
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function write($type, $message)
|
public static function write($type, $message, $pretty_print = false)
|
||||||
{
|
{
|
||||||
|
$message = ($pretty_print) ? print_r($message, true) : $message;
|
||||||
|
|
||||||
// If there is a listener for the log event, we'll delegate the logging
|
// If there is a listener for the log event, we'll delegate the logging
|
||||||
// to the event and not write to the log files. This allows for quick
|
// to the event and not write to the log files. This allows for quick
|
||||||
// swapping of log implementations for debugging.
|
// swapping of log implementations for debugging.
|
||||||
|
@ -75,11 +82,18 @@ protected static function format($type, $message)
|
||||||
*
|
*
|
||||||
* // Write a "warning" message to the log file
|
* // Write a "warning" message to the log file
|
||||||
* Log::warning('This is a warning!');
|
* Log::warning('This is a warning!');
|
||||||
|
*
|
||||||
|
* // Log an arrays data
|
||||||
|
* Log::info(array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
|
||||||
|
* //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
|
||||||
|
* //If we had omit the second parameter the result had been: Array
|
||||||
* </code>
|
* </code>
|
||||||
*/
|
*/
|
||||||
public static function __callStatic($method, $parameters)
|
public static function __callStatic($method, $parameters)
|
||||||
{
|
{
|
||||||
static::write($method, $parameters[0]);
|
$parameters[1] = (empty($parameters[1])) ? false : $parameters[1];
|
||||||
|
|
||||||
|
static::write($method, $parameters[0], $parameters[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -13,6 +13,7 @@ .anbu
|
||||||
right:0 !important;
|
right:0 !important;
|
||||||
width:100%;
|
width:100%;
|
||||||
z-index: 9999 !important;
|
z-index: 9999 !important;
|
||||||
|
color: #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.anbu-tabs
|
.anbu-tabs
|
||||||
|
|
Loading…
Reference in New Issue