From 8facddcf0f847e2aa30d6015f5d0b5bf79f21a9c Mon Sep 17 00:00:00 2001 From: jacques42 Date: Fri, 30 Jul 2021 12:49:49 +0200 Subject: [PATCH] debugpanel: small improvements and added access to gphoto logs (PR #277) --- admin/debugpanel.php | 1 + api/serverInfo.php | 20 +++++++++++++++----- resources/lang/en.json | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/admin/debugpanel.php b/admin/debugpanel.php index 0612043f8..006911737 100644 --- a/admin/debugpanel.php +++ b/admin/debugpanel.php @@ -89,6 +89,7 @@ function html_src_indent($num) echo '
  • myconfig
  • '; echo '
  • remotebuzzer
  • '; echo '
  • synctodrive
  • '; + echo '
  • cameralog
  • '; echo '
  • serverprocesses
  • '; echo '
  • bootconfig
  • '; diff --git a/api/serverInfo.php b/api/serverInfo.php index 2fc379da5..dae8a49fd 100644 --- a/api/serverInfo.php +++ b/api/serverInfo.php @@ -9,11 +9,11 @@ switch ($content) { case 'nav-remotebuzzerlog': - echo dumpfile($config['foldersAbs']['tmp'] . '/' . $config['remotebuzzer']['logfile']); + echo dumpfile($config['foldersAbs']['tmp'] . '/' . $config['remotebuzzer']['logfile'], true); break; case 'nav-synctodrivelog': - echo dumpfile($config['foldersAbs']['tmp'] . '/' . $config['synctodrive']['logfile']); + echo dumpfile($config['foldersAbs']['tmp'] . '/' . $config['synctodrive']['logfile'], true); break; case 'nav-myconfig': @@ -25,15 +25,25 @@ break; case 'nav-bootconfig': - echo dumpfile('/boot/config.txt'); + echo dumpfile('/boot/config.txt', null); + break; + + case 'nav-cameralog': + echo dumpfile($config['foldersAbs']['tmp'] . '/' . $config['take_picture']['logfile'], false); break; default: - echo 'UNKNOWN COMMAND'; + echo 'Unknown debug panel parameter'; break; } -function dumpfile($file) { +function dumpfile($file, $devModeRequired) { + global $config; + + if ($devModeRequired !== null && $config['dev']['enabled'] !== $devModeRequired) { + return 'INFO: Dev mode is ' . ($config['dev']['enabled'] ? 'enabled - please disable' : 'disabled - please enable') . ' to see logs'; + } + if (!file_exists($file)) { return 'INFO: File (' . $file . ') does not exist'; } elseif (!is_file($file)) { diff --git a/resources/lang/en.json b/resources/lang/en.json index baeffe152..0848cdae7 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1,5 +1,6 @@ { "abort": "Abort", + "cameralog": "gphoto logs", "admin_panel": "Admin panel", "adminpanel_back": "Back", "adminpanel_toggletextOFF": "Off",