Skip to content
Snippets Groups Projects
Unverified Commit 09812bbc authored by Jaime Pérez Crespo's avatar Jaime Pérez Crespo Committed by GitHub
Browse files

Merge pull request #1204 from simplesamlphp/stats-fix

Stats fix
parents 5f264d4d dfc402b7
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ class File extends \SimpleSAML\Stats\Output ...@@ -20,7 +20,7 @@ class File extends \SimpleSAML\Stats\Output
/** /**
* The file handle for the current file. * The file handle for the current file.
* @var resource|null|false * @var resource|null
*/ */
private $file = null; private $file = null;
...@@ -65,14 +65,15 @@ class File extends \SimpleSAML\Stats\Output ...@@ -65,14 +65,15 @@ class File extends \SimpleSAML\Stats\Output
} }
$fileName = $this->logDir.'/'.$date.'.log'; $fileName = $this->logDir.'/'.$date.'.log';
$this->file = @fopen($fileName, 'a'); $fh = @fopen($fileName, 'a');
if ($this->file === false) { if ($fh === false) {
throw new Error\Exception('Error opening log file: '.var_export($fileName, true)); throw new Error\Exception('Error opening log file: '.var_export($fileName, true));
} }
// Disable output buffering // Disable output buffering
stream_set_write_buffer($this->file, 0); stream_set_write_buffer($fh, 0);
$this->file = $fh;
$this->fileDate = $date; $this->fileDate = $date;
} }
...@@ -87,10 +88,6 @@ class File extends \SimpleSAML\Stats\Output ...@@ -87,10 +88,6 @@ class File extends \SimpleSAML\Stats\Output
{ {
assert(isset($data['time'])); assert(isset($data['time']));
if ($this->file === false || $this->file === null) {
throw new Error\Exception('Error opening log file: invalid handle');
}
$time = $data['time']; $time = $data['time'];
$milliseconds = (int) (($time - (int) $time) * 1000); $milliseconds = (int) (($time - (int) $time) * 1000);
...@@ -103,6 +100,7 @@ class File extends \SimpleSAML\Stats\Output ...@@ -103,6 +100,7 @@ class File extends \SimpleSAML\Stats\Output
} }
$line = $timestamp.' '.json_encode($data)."\n"; $line = $timestamp.' '.json_encode($data)."\n";
/** @psalm-suppress PossiblyNullArgument */
fwrite($this->file, $line); fwrite($this->file, $line);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment