From cbcf7eb35055f575044a358db775097e0eab559e Mon Sep 17 00:00:00 2001 From: Robert Lu Date: Mon, 4 Jun 2018 14:47:46 +0800 Subject: [PATCH] make locking configurable --- src/examples/resources/appender_dailyfile.properties | 1 + src/examples/resources/appender_file.properties | 1 + src/examples/resources/appender_rollingfile.properties | 1 + src/examples/resources/appender_socket_server.properties | 1 + src/main/php/appenders/LoggerAppenderFile.php | 7 ++++--- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/examples/resources/appender_dailyfile.properties b/src/examples/resources/appender_dailyfile.properties index 955029c..d4c1e2f 100644 --- a/src/examples/resources/appender_dailyfile.properties +++ b/src/examples/resources/appender_dailyfile.properties @@ -17,6 +17,7 @@ ; START SNIPPET: doxia log4php.appender.default = LoggerAppenderDailyFile log4php.appender.default.layout = LoggerLayoutTTCC +log4php.appender.default.locking = 0 log4php.appender.default.datePattern = Ymd log4php.appender.default.file = target/examples/daily_%s.log log4php.rootLogger = DEBUG, default diff --git a/src/examples/resources/appender_file.properties b/src/examples/resources/appender_file.properties index b55142e..4e7cc61 100644 --- a/src/examples/resources/appender_file.properties +++ b/src/examples/resources/appender_file.properties @@ -16,6 +16,7 @@ ; ; START SNIPPET: doxia log4php.appender.default = LoggerAppenderFile +log4php.appender.default.locking = 0 log4php.appender.default.file = target/examples/file.log log4php.appender.default.layout = LoggerLayoutTTCC log4php.rootLogger = DEBUG, default diff --git a/src/examples/resources/appender_rollingfile.properties b/src/examples/resources/appender_rollingfile.properties index 87405c0..54ae493 100644 --- a/src/examples/resources/appender_rollingfile.properties +++ b/src/examples/resources/appender_rollingfile.properties @@ -17,6 +17,7 @@ ; START SNIPPET: doxia log4php.appender.default = LoggerAppenderRollingFile log4php.appender.default.layout = LoggerLayoutTTCC +log4php.appender.default.locking = 0 log4php.appender.default.file = target/examples/appender_rollingfile.log log4php.appender.default.MaxFileSize = 100 log4php.appender.default.MaxBackupIndex = 3 diff --git a/src/examples/resources/appender_socket_server.properties b/src/examples/resources/appender_socket_server.properties index 652b923..74bd5a0 100644 --- a/src/examples/resources/appender_socket_server.properties +++ b/src/examples/resources/appender_socket_server.properties @@ -19,6 +19,7 @@ log4php.debug = true log4php.appender.file = LoggerAppenderFile log4php.appender.file.file = server.log log4php.appender.file.layout = LoggerLayoutTTCC +log4php.appender.file.locking = 0 log4php.appender.console = LoggerAppenderEcho log4php.appender.console.layout = LoggerLayoutSimple log4php.rootLogger = INFO, file, console diff --git a/src/main/php/appenders/LoggerAppenderFile.php b/src/main/php/appenders/LoggerAppenderFile.php index f29cbe3..413afcd 100644 --- a/src/main/php/appenders/LoggerAppenderFile.php +++ b/src/main/php/appenders/LoggerAppenderFile.php @@ -40,9 +40,6 @@ class LoggerAppenderFile extends LoggerAppender { * If set to true, the file is locked before appending. This allows * concurrent access. However, appending without locking is faster so * it should be used where appropriate. - * - * TODO: make this a configurable parameter - * * @var boolean */ protected $locking = true; @@ -222,4 +219,8 @@ class LoggerAppenderFile extends LoggerAppender { public function getFileName() { return $this->getFile(); } + + public function setLocking($locking){ + $this->locking = boolval($locking); + } } -- 2.17.0