[Vtigercrm-commits] [vtiger-commits] r5729 - /vtigercrm/trunk/log4php/appenders/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu May 4 00:05:22 EDT 2006
Author: saraj
Date: Wed May 3 22:05:05 2006
New Revision: 5729
Log:
log4php version has been updated
Modified:
vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderEcho.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderFile.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderMail.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderMailEvent.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderNull.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderPhp.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderRollingFile.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderSocket.php
vtigercrm/trunk/log4php/appenders/LoggerAppenderSyslog.php
Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php
==============================================================================
--- vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php (original)
+++ vtigercrm/trunk/log4php/appenders/LoggerAppenderConsole.php Wed May 3 22:05:05 2006
@@ -1,139 +1,139 @@
-<?php
-/**
- * log4php is a PHP port of the log4j java logging package.
- *
- * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
- * <p>Design, strategies and part of the methods documentation are developed by log4j team
- * (Ceki Gülcü as log4j project founder and
- * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
- *
- * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
- * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
- *
- * <p>This software is published under the terms of the LGPL License
- * a copy of which has been included with this distribution in the LICENSE file.</p>
- *
- * @package log4php
- * @subpackage appenders
- */
-
-/**
- * @ignore
- */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
-
-define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout');
-define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr');
-
-/**
- * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user.
- *
- * <p>Optional parameter is {@link $target}. The default target is Stdout.</p>
- * <p><b>Note</b>: Use this Appender with command-line php scripts.
- * On web scripts this appender has no effects.</p>
- * <p>This appender requires a layout.</p>
- *
- * @author VxR <vxr at vxr.it>
- * @version $Revision: 1.1 $
- * @package log4php
- * @subpackage appenders
- */
-class LoggerAppenderConsole extends LoggerAppenderSkeleton {
-
- /**
- * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive).
- * Default is STDOUT
- * @var string
- */
- var $target = 'php://stdout';
-
- /**
- * @var boolean
- * @access private
- */
- var $requiresLayout = true;
-
- /**
- * @var mixed the resource used to open stdout/stderr
- * @access private
- */
- var $fp = false;
-
- /**
- * Constructor.
- *
- * @param string $name appender name
- */
- function LoggerAppenderConsole($name)
- {
- $this->LoggerAppenderSkeleton($name);
- }
-
- /**
- * Set console target.
- * @param mixed $value a constant or a string
- */
- function setTarget($value)
- {
- $v = trim($value);
- if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') {
- $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT;
- } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') {
- $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT;
- } else {
- LoggerLog::debug(
- "LoggerAppenderConsole::targetWarn() ".
- "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default."
- );
- }
- }
-
- function getTarget()
- {
- return $this->target;
- }
-
- function activateOptions()
- {
- LoggerLog::debug("LoggerAppenderConsole::activateOptions()");
-
- $this->fp = @fopen($this->getTarget(), 'w');
-
- if ($this->fp and $this->layout !== null)
- @fwrite($this->fp, $this->layout->getHeader());
-
- $this->closed = (bool)($this->fp === false);
- }
-
- /**
- * @see LoggerAppender::close()
- */
- function close()
- {
- LoggerLog::debug("LoggerAppenderConsole::close()");
-
- if ($this->fp and $this->layout !== null) {
- @fwrite($this->fp, $this->layout->getFooter());
- }
- @fclose($this->fp);
- $this->closed = true;
- }
-
- function append($event)
- {
- if ($this->fp and $this->layout !== null) {
-
- LoggerLog::debug("LoggerAppenderConsole::append()");
-
- @fwrite($this->fp, $this->layout->format($event));
- }
- }
-}
-
+<?php
+/**
+ * log4php is a PHP port of the log4j java logging package.
+ *
+ * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
+ * <p>Design, strategies and part of the methods documentation are developed by log4j team
+ * (Ceki Gülcü as log4j project founder and
+ * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
+ *
+ * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
+ * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
+ *
+ * <p>This software is published under the terms of the LGPL License
+ * a copy of which has been included with this distribution in the LICENSE file.</p>
+ *
+ * @package log4php
+ * @subpackage appenders
+ */
+
+/**
+ * @ignore
+ */
+if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
+
+/**
+ */
+require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
+require_once(LOG4PHP_DIR . '/LoggerLog.php');
+
+
+define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT', 'php://stdout');
+define('LOG4PHP_LOGGER_APPENDER_CONSOLE_STDERR', 'php://stderr');
+
+/**
+ * ConsoleAppender appends log events to STDOUT or STDERR using a layout specified by the user.
+ *
+ * <p>Optional parameter is {@link $target}. The default target is Stdout.</p>
+ * <p><b>Note</b>: Use this Appender with command-line php scripts.
+ * On web scripts this appender has no effects.</p>
+ * <p>This appender requires a layout.</p>
+ *
+ * @author VxR <vxr at vxr.it>
+ * @version $Revision: 1.11 $
+ * @package log4php
+ * @subpackage appenders
+ */
+class LoggerAppenderConsole extends LoggerAppenderSkeleton {
+
+ /**
+ * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive).
+ * Default is STDOUT
+ * @var string
+ */
+ var $target = 'php://stdout';
+
+ /**
+ * @var boolean
+ * @access private
+ */
+ var $requiresLayout = true;
+
+ /**
+ * @var mixed the resource used to open stdout/stderr
+ * @access private
+ */
+ var $fp = false;
+
+ /**
+ * Constructor.
+ *
+ * @param string $name appender name
+ */
+ function LoggerAppenderConsole($name)
+ {
+ $this->LoggerAppenderSkeleton($name);
+ }
+
+ /**
+ * Set console target.
+ * @param mixed $value a constant or a string
+ */
+ function setTarget($value)
+ {
+ $v = trim($value);
+ if ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDOUT') {
+ $this->target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT;
+ } elseif ($v == LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT or strtoupper($v) == 'STDERR') {
+ $target = LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT;
+ } else {
+ LoggerLog::debug(
+ "LoggerAppenderConsole::targetWarn() ".
+ "Invalid target. Using '".LOG4PHP_LOGGER_APPENDER_CONSOLE_STDOUT."' by default."
+ );
+ }
+ }
+
+ function getTarget()
+ {
+ return $this->target;
+ }
+
+ function activateOptions()
+ {
+ LoggerLog::debug("LoggerAppenderConsole::activateOptions()");
+
+ $this->fp = @fopen($this->getTarget(), 'w');
+
+ if ($this->fp and $this->layout !== null)
+ @fwrite($this->fp, $this->layout->getHeader());
+
+ $this->closed = (bool)($this->fp === false);
+ }
+
+ /**
+ * @see LoggerAppender::close()
+ */
+ function close()
+ {
+ LoggerLog::debug("LoggerAppenderConsole::close()");
+
+ if ($this->fp and $this->layout !== null) {
+ @fwrite($this->fp, $this->layout->getFooter());
+ }
+ @fclose($this->fp);
+ $this->closed = true;
+ }
+
+ function append($event)
+ {
+ if ($this->fp and $this->layout !== null) {
+
+ LoggerLog::debug("LoggerAppenderConsole::append()");
+
+ @fwrite($this->fp, $this->layout->format($event));
+ }
+ }
+}
+
?>
Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php
==============================================================================
--- vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php (original)
+++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDailyFile.php Wed May 3 22:05:05 2006
@@ -1,97 +1,97 @@
-<?php
-/**
- * log4php is a PHP port of the log4j java logging package.
- *
- * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
- * <p>Design, strategies and part of the methods documentation are developed by log4j team
- * (Ceki Gülcü as log4j project founder and
- * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
- *
- * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
- * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
- *
- * <p>This software is published under the terms of the LGPL License
- * a copy of which has been included with this distribution in the LICENSE file.</p>
- *
- * @package log4php
- * @subpackage appenders
- */
-
-/**
- * @ignore
- */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php');
-
-/**
- * LoggerAppenderDailyFile appends log events to a file ne.
- *
- * A formatted version of the date pattern is used as to create the file name
- * using the {@link PHP_MANUAL#sprintf} function.
- * <p>Parameters are {@link $datePattern}, {@link $file}. Note that file
- * parameter should include a '%s' identifier and should always be set
- * before {@link $file} param.</p>
- *
- * @author Abel Gonzalez <agonzalez at lpsz.org>
- * @version $Revision: 1.1 $
- * @package log4php
- * @subpackage appenders
- */
-class LoggerAppenderDailyFile extends LoggerAppenderFile {
-
- /**
- * Format date.
- * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
- * @var string
- */
- var $datePattern = "Ymd";
-
- /**
- * Constructor
- *
- * @param string $name appender name
- */
- function LoggerAppenderDailyFile($name)
- {
- $this->LoggerAppenderFile($name);
- }
-
- /**
- * Sets date format for the file name.
- * @param string $format a regular date() string format
- */
- function setDatePattern ( $format )
- {
- $this->datePattern = $format;
- }
-
- /**
- * @return string returns date format for the filename
- */
- function getDatePattern ( )
- {
- return $this->datePattern;
- }
-
- /**
- * The File property takes a string value which should be the name of the file to append to.
- * Sets and opens the file where the log output will go.
- *
- * @see LoggerAppenderFile::setFile()
- */
- function setFile()
- {
- $numargs = func_num_args();
- $args = func_get_args();
-
- if ($numargs == 1 and is_string($args[0])) {
- parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
- } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
- parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
- }
- }
-
-}
-
+<?php
+/**
+ * log4php is a PHP port of the log4j java logging package.
+ *
+ * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
+ * <p>Design, strategies and part of the methods documentation are developed by log4j team
+ * (Ceki Gülcü as log4j project founder and
+ * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
+ *
+ * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
+ * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
+ *
+ * <p>This software is published under the terms of the LGPL License
+ * a copy of which has been included with this distribution in the LICENSE file.</p>
+ *
+ * @package log4php
+ * @subpackage appenders
+ */
+
+/**
+ * @ignore
+ */
+if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
+
+require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php');
+
+/**
+ * LoggerAppenderDailyFile appends log events to a file ne.
+ *
+ * A formatted version of the date pattern is used as to create the file name
+ * using the {@link PHP_MANUAL#sprintf} function.
+ * <p>Parameters are {@link $datePattern}, {@link $file}. Note that file
+ * parameter should include a '%s' identifier and should always be set
+ * before {@link $file} param.</p>
+ *
+ * @author Abel Gonzalez <agonzalez at lpsz.org>
+ * @version $Revision: 1.7 $
+ * @package log4php
+ * @subpackage appenders
+ */
+class LoggerAppenderDailyFile extends LoggerAppenderFile {
+
+ /**
+ * Format date.
+ * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
+ * @var string
+ */
+ var $datePattern = "Ymd";
+
+ /**
+ * Constructor
+ *
+ * @param string $name appender name
+ */
+ function LoggerAppenderDailyFile($name)
+ {
+ $this->LoggerAppenderFile($name);
+ }
+
+ /**
+ * Sets date format for the file name.
+ * @param string $format a regular date() string format
+ */
+ function setDatePattern ( $format )
+ {
+ $this->datePattern = $format;
+ }
+
+ /**
+ * @return string returns date format for the filename
+ */
+ function getDatePattern ( )
+ {
+ return $this->datePattern;
+ }
+
+ /**
+ * The File property takes a string value which should be the name of the file to append to.
+ * Sets and opens the file where the log output will go.
+ *
+ * @see LoggerAppenderFile::setFile()
+ */
+ function setFile()
+ {
+ $numargs = func_num_args();
+ $args = func_get_args();
+
+ if ($numargs == 1 and is_string($args[0])) {
+ parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
+ } elseif ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
+ parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
+ }
+ }
+
+}
+
?>
Modified: vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php
==============================================================================
--- vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php (original)
+++ vtigercrm/trunk/log4php/appenders/LoggerAppenderDb.php Wed May 3 22:05:05 2006
@@ -1,209 +1,209 @@
-<?php
-/**
- * log4php is a PHP port of the log4j java logging package.
- *
- * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
- * <p>Design, strategies and part of the methods documentation are developed by log4j team
- * (Ceki Gülcü as log4j project founder and
- * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
- *
- * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
- * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
- *
- * <p>This software is published under the terms of the LGPL License
- * a copy of which has been included with this distribution in the LICENSE file.</p>
- *
- * @package log4php
- * @subpackage appenders
- */
-
-/**
- * @ignore
- */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once('DB.php');
-
-/**
- * Appends log events to a db table using PEAR::DB class.
- *
- * <p>This appender uses a table in a database to log events.</p>
- * <p>Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.</p>
- * <p>See examples in test directory.</p>
- *
- * @author VxR <vxr at vxr.it>
- * @version $Revision: 1.1 $
- * @package log4php
- * @subpackage appenders
- * @since 0.3
- */
-class LoggerAppenderDb extends LoggerAppenderSkeleton {
-
- /**
- * Create the log table if it does not exists (optional).
- * @var boolean
- */
- var $createTable = true;
-
- /**
- * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory).
- * @var string
- */
- var $dsn;
-
- /**
- * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory).
- * @var string
- */
- var $sql;
-
- /**
- * Table name to write events. Used only if {@link $createTable} is true.
- * @var string
- */
- var $table;
-
- /**
- * @var object PEAR::Db instance
- * @access private
- */
- var $db = null;
-
- /**
- * @var boolean used to check if all conditions to append are true
- * @access private
- */
- var $canAppend = true;
-
- /**
- * @access private
- */
- var $requiresLayout = false;
-
- /**
- * Constructor.
- *
- * @param string $name appender name
- */
- function LoggerAppenderDb($name)
- {
- $this->LoggerAppenderSkeleton($name);
- }
-
- /**
- * Setup db connection.
- * Based on defined options, this method connects to db defined in {@link $dsn}
- * and creates a {@link $table} table if {@link $createTable} is true.
- * @return boolean true if all ok.
- */
- function activateOptions()
- {
- $this->db = DB::connect($this->dsn);
-
- if (DB::isError($this->db)) {
- LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]");
- $this->db = null;
- $this->closed = true;
- $this->canAppend = false;
-
- } else {
-
- $this->layout = LoggerLayout::factory('LoggerPatternLayout');
- $this->layout->setConversionPattern($this->getSql());
-
- // test if log table exists
- $tableInfo = $this->db->tableInfo($this->table, $mode = null);
- if (DB::isError($tableInfo) and $this->getCreateTable()) {
- $query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );";
-
- LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'");
-
- $result = $this->db->query($query);
- if (DB::isError($result)) {
- LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage());
- $this->canAppend = false;
- return;
- }
- }
- $this->canAppend = true;
- }
-
- }
-
- function append($event)
- {
- if ($this->canAppend) {
-
- $query = $this->layout->format($event);
-
- LoggerLog::debug("LoggerAppenderDb::append() query='$query'");
-
- $this->db->query($query);
- }
- }
-
- function close()
- {
- if ($this->db !== null)
- $this->db->disconnect();
- $this->closed = true;
- }
-
- /**
- * @return boolean
- */
- function getCreateTable()
- {
- return $this->createTable;
- }
-
- /**
- * @return string the defined dsn
- */
- function getDsn()
- {
- return $this->dsn;
- }
-
- /**
- * @return string the sql pattern string
- */
- function getSql()
- {
- return $this->sql;
- }
-
- /**
- * @return string the table name to create
- */
- function getTable()
- {
- return $this->table;
- }
-
- function setCreateTable($flag)
- {
- $this->createTable = LoggerOptionConverter::toBoolean($flag, true);
- }
-
- function setDsn($newDsn)
- {
- $this->dsn = $newDsn;
- }
-
- function setSql($sql)
- {
- $this->sql = $sql;
- }
-
- function setTable($table)
- {
- $this->table = $table;
- }
-
-}
-
+<?php
+/**
+ * log4php is a PHP port of the log4j java logging package.
+ *
+ * <p>This framework is based on log4j (see {@link http://jakarta.apache.org/log4j log4j} for details).</p>
+ * <p>Design, strategies and part of the methods documentation are developed by log4j team
+ * (Ceki Gülcü as log4j project founder and
+ * {@link http://jakarta.apache.org/log4j/docs/contributors.html contributors}).</p>
+ *
+ * <p>PHP port, extensions and modifications by VxR. All rights reserved.<br>
+ * For more information, please see {@link http://www.vxr.it/log4php/}.</p>
+ *
+ * <p>This software is published under the terms of the LGPL License
+ * a copy of which has been included with this distribution in the LICENSE file.</p>
+ *
+ * @package log4php
+ * @subpackage appenders
+ */
+
+/**
+ * @ignore
+ */
+if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
+
+require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
+require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
+require_once(LOG4PHP_DIR . '/LoggerLog.php');
+require_once('DB.php');
+
+/**
+ * Appends log events to a db table using PEAR::DB class.
+ *
+ * <p>This appender uses a table in a database to log events.</p>
+ * <p>Parameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.</p>
+ * <p>See examples in test directory.</p>
+ *
+ * @author VxR <vxr at vxr.it>
+ * @version $Revision: 1.7 $
+ * @package log4php
+ * @subpackage appenders
+ * @since 0.3
+ */
+class LoggerAppenderDb extends LoggerAppenderSkeleton {
+
+ /**
+ * Create the log table if it does not exists (optional).
+ * @var boolean
+ */
+ var $createTable = true;
+
+ /**
+ * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory)
More information about the vtigercrm-commits
mailing list