Skip to content

Commit

Permalink
Merge pull request #2 from zunnu/dev
Browse files Browse the repository at this point in the history
Added loading default app debug and error log if no file is selected
  • Loading branch information
zunnu authored Oct 24, 2021
2 parents fde75fa + f7b4be5 commit 4978009
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Controller/LogReaderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function index($date = null) {
$this->set('logs', $this->Reader->read());
$this->set('files', $this->Reader->getFiles());
$this->set('types', $this->Reader->getLogTypes());
$this->set('selectedFiles', !empty($conditions['files']) ? $conditions['files'] : []);
$this->set('selectedFiles', !empty($conditions['files']) ? $conditions['files'] : ['debug.log', 'error.log']);
$this->set('selectedTypes', !empty($conditions['types']) ? $conditions['types'] : []);
}
}
8 changes: 6 additions & 2 deletions src/Reader.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ private function getLogFile($selectedFiles = []) {
$folder = new Folder(LOGS);
$files = $folder->findRecursive('.*', true);
$data = [];


// load default files
if(empty($selectedFiles)) {
$selectedFiles = ['debug.log', 'error.log'];
}

if(!empty($files)) {
foreach($files as $file) {
$file = new File($file);
Expand Down Expand Up @@ -118,7 +123,6 @@ private function getLogFile($selectedFiles = []) {
}

$data[$type] .= file_get_contents($file->pwd());
return $data;
}

return $data;
Expand Down

0 comments on commit 4978009

Please sign in to comment.