change file name, format and size

Author: tijmenbruggeman

src/class-tiny-diagnostics.php

@@ -210,7 +210,7 @@ public function create_diagnostic_zip() {
 
 		// Add diagnostic info.
 		$info = self::collect_info();
-		$zip->addFromString( 'diagnostics.json', wp_json_encode( $info, JSON_PRETTY_PRINT ) );
+		$zip->addFromString( 'tiny-diagnostics.json', wp_json_encode( $info, JSON_PRETTY_PRINT ) );
 
 		// Add log files.
 		$logger = Tiny_Logger::get_instance();

src/class-tiny-image.php

@@ -253,7 +253,7 @@ public function compress() {
 					$size->add_tiny_meta_error( $e );
 					$failed++;
 					Tiny_Logger::error('compress failed', array(
-						'error' => $e,
+						'error' => $e->get_message(),
 						'size' => $size_name,
 						'image_id' => $this->id,
 					));

src/class-tiny-logger.php

@@ -31,7 +31,7 @@ class Tiny_Logger {
 	const LOG_LEVEL_ERROR = 'error';
 	const LOG_LEVEL_DEBUG = 'debug';
 
-	const MAX_LOG_SIZE = 5242880; // 5MB
+	const MAX_LOG_SIZE = 2 * 1024 * 1024; // 2MB
 
 	private static $instance = null;
 
@@ -176,11 +176,14 @@ private function log( $level, $message, $context = array() ) {
 		$timestamp = current_time( 'Y-m-d H:i:s' );
 		$level_str = strtoupper( $level );
 		$context_str = ! empty( $context ) ? ' ' . wp_json_encode( $context ) : '';
-		$log_entry = "[{$timestamp}] [{$level_str}] {$message}{$context_str}\\n";
-
+		$log_entry = "[{$timestamp}] [{$level_str}] {$message}{$context_str}" . PHP_EOL;
 		$file = fopen( $this->log_file_path, 'a' );
 		if ( $file ) {
-			fwrite( $file, $log_entry );
+			if ( flock( $file, LOCK_EX ) ) {
+				fwrite( $file, $log_entry );
+				fflush( $file );
+				flock( $file, LOCK_UN );
+			}
 			fclose( $file );
 		}
 	}

test/unit/TinyLoggerTest.php

@@ -102,12 +102,12 @@ public function test_removes_full_log_and_creates_new()
 		$log_dir = $this->vfs->getChild($log_dir_path);
 
 		vfsStream::newFile('tiny-compress.log')
-			->withContent(LargeFileContent::withMegabytes(5.1))
+			->withContent(LargeFileContent::withMegabytes(2.1))
 			->at($log_dir);
 
 		$logger = Tiny_Logger::get_instance();
 
-		assertTrue(filesize($logger->get_log_file_path()) > 5242880, 'log file should be larger than 5MB');
+		assertTrue(filesize($logger->get_log_file_path()) > 2097152, 'log file should be larger than 2MB');
 
 		Tiny_Logger::error('This should be logged');