kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Update debug information.

Browse Source
This commit is contained in:
James Cole
2017-11-08 08:23:58 +01:00
parent 19c9fc794d
commit 428bdfbe6f
6 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.docker
View File

@@ -55,4 +55,6 @@ PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=true IS_DOCKER=true
IS_SANDSTORM=false

2
.env.example
View File

@@ -55,4 +55,6 @@ PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=false

2
.env.sandstorm
View File

@@ -55,4 +55,6 @@ PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false IS_DOCKER=false
IS_SANDSTORM=true

2
.env.testing
View File

@@ -56,3 +56,5 @@ PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=false

25
app/Http/Controllers/HomeController.php
View File

@@ -94,14 +94,17 @@ class HomeController extends Controller
*/ */
public function displayDebug(Request $request) public function displayDebug(Request $request)
{ {
$phpVersion = PHP_VERSION; $phpVersion = PHP_VERSION;
$phpOs = php_uname(); $phpOs = php_uname();
$interface = php_sapi_name(); $interface = php_sapi_name();
$now = Carbon::create()->format('Y-m-d H:i:s e'); $now = Carbon::create()->format('Y-m-d H:i:s e');
$extensions = join(', ', get_loaded_extensions()); $extensions = join(', ', get_loaded_extensions());
$drivers = join(', ', DB::availableDrivers()); $drivers = join(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $userAgent = $request->header('user-agent');
$isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true);
$isDocker = var_export(env('IS_DOCKER', 'unknown'), true);
$trustedProxies = env('TRUSTED_PROXIES', '(none)');
// get latest log file: // get latest log file:
$logger = Log::getMonolog(); $logger = Log::getMonolog();
@@ -118,7 +121,11 @@ class HomeController extends Controller
// last few lines // last few lines
$logContent = 'Truncated from this point <----|' . substr($logContent, -4096); $logContent = 'Truncated from this point <----|' . substr($logContent, -4096);
return view('debug', compact('phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent')); return view(
'debug', compact(
'phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent', 'isDocker', 'isSandstorm','trustedProxies'
)
);
} }

4
resources/views/debug.twig
View File

@@ -24,7 +24,11 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| Current driver | {{ currentDriver }} | | Current driver | {{ currentDriver }} |
| Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} | | Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} |
{% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %} {% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %}
| Is Sandstorm (.env) | {{ isSandstorm }} |
| Is Docker (.env) | {{ isDocker }} |
| Trusted proxies (.env) | {{ trustedProxies }} |
| User agent | {{ userAgent }} | | User agent | {{ userAgent }} |
</textarea> </textarea>