From b367c951b990b38677e67f1a1756cd4d1eaee50b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 09:45:43 +0400
Subject: make logging configurable; add logging to syslog

---
 classes/logger.php        | 39 ++++++++++++++++++++++--
 classes/logger/sql.php    |  3 --
 classes/logger/syslog.php | 31 ++++++++++++++++++++
 classes/pref/system.php   | 75 ++++++++++++++++++++++++++---------------------
 4 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 classes/logger/syslog.php

(limited to 'classes')

diff --git a/classes/logger.php b/classes/logger.php
index 3c501eb92..4a9c1df82 100644
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -1,5 +1,7 @@
 <?php
 class Logger {
+	private static $instance;
+	private $adapter;
 
 	public static $errornames = array(
 		1			=> 'E_ERROR',
@@ -20,11 +22,44 @@ class Logger {
 		32767		=> 'E_ALL');
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-		return false;
+		if ($errno == E_NOTICE) return false;
+
+		if ($this->adapter)
+			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		else
+			return false;
 	}
 
 	function log($string) {
-		return false;
+		if ($this->adapter)
+			return $this->adapter->log($string);
+		else
+			return false;
+	}
+
+	private function __clone() {
+		//
+	}
+
+	function __construct() {
+		switch (LOG_DESTINATION) {
+		case "sql":
+			$this->adapter = new Logger_SQL();
+			break;
+		case "syslog":
+			$this->adapter = new Logger_Syslog();
+			break;
+		default:
+			$this->adapter = false;
+		}
 	}
+
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
 }
 ?>
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 50e5de9a6..c0f8b4598 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -2,9 +2,6 @@
 class Logger_SQL {
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-
-		if ($errno == E_NOTICE) return false;
-
 		if (Db::get() && get_schema_version() > 117) {
 
 			$errno = Db::get()->escape_string($errno);
diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php
new file mode 100644
index 000000000..b8b5260a0
--- /dev/null
+++ b/classes/logger/syslog.php
@@ -0,0 +1,31 @@
+<?php
+class Logger_Syslog {
+
+	function log_error($errno, $errstr, $file, $line, $context) {
+
+		switch ($errno) {
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_COMPILE_ERROR:
+		case E_USER_ERROR:
+			$priority = LOG_ERR;
+			break;
+		case E_WARNING:
+		case E_CORE_WARNING:
+		case E_COMPILE_WARNING:
+		case E_USER_WARNING:
+			$priority = LOG_WARNING;
+			break;
+		default:
+			$priority = LOG_INFO;
+		}
+
+		$errname = Logger::$errornames[$errno] . " ($errno)";
+
+		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+
+	}
+
+}
+?>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 725c337dc..d2b6cd746 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -24,46 +24,53 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
-			created_at, login FROM ttrss_error_log
-			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
-			ORDER BY ttrss_error_log.id DESC
-			LIMIT 100");
-
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
-
-		print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
-
-		print "<tr class=\"title\">
-			<td width='5%'>".__("Error")."</td>
-			<td>".__("Filename")."</td>
-			<td>".__("Message")."</td>
-			<td width='5%'>".__("User")."</td>
-			<td width='5%'>".__("Date")."</td>
-			</tr>";
-
-		while ($line = $this->dbh->fetch_assoc($result)) {
-			print "<tr class=\"errrow\">";
-
-			foreach ($line as $k => $v) {
-				$line[$k] = htmlspecialchars($v);
+		if (LOG_DESTINATION == "sql") {
+
+			$result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
+				created_at, login FROM ttrss_error_log
+				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+				ORDER BY ttrss_error_log.id DESC
+				LIMIT 100");
+
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
+
+			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+			print "<tr class=\"title\">
+				<td width='5%'>".__("Error")."</td>
+				<td>".__("Filename")."</td>
+				<td>".__("Message")."</td>
+				<td width='5%'>".__("User")."</td>
+				<td width='5%'>".__("Date")."</td>
+				</tr>";
+
+			while ($line = $this->dbh->fetch_assoc($result)) {
+				print "<tr class=\"errrow\">";
+
+				foreach ($line as $k => $v) {
+					$line[$k] = htmlspecialchars($v);
+				}
+
+				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+				print "<td class='errstr'>" . $line["errstr"] . "</td>";
+				print "<td class='login'>" . $line["login"] . "</td>";
+
+				print "<td class='timestamp'>" .
+					make_local_datetime(
+					$line["created_at"], false) . "</td>";
+
+				print "</tr>";
 			}
 
-			print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-			print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-			print "<td class='errstr'>" . $line["errstr"] . "</td>";
-			print "<td class='login'>" . $line["login"] . "</td>";
+			print "</table>";
+		} else {
 
-			print "<td class='timestamp'>" .
-				make_local_datetime(
-				$line["created_at"], false) . "</td>";
+			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-			print "</tr>";
 		}
 
-		print "</table>";
-
 		print "</div>";
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-- 
cgit v1.2.3-54-g00ecf