From 2cbdc95bb00faad46df8976cf9b33e1bc188ec91 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 08:42:39 +0400 Subject: add a separate tab for the logger --- classes/pref/system.php | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 classes/pref/system.php (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php new file mode 100644 index 000000000..2957b7b96 --- /dev/null +++ b/classes/pref/system.php @@ -0,0 +1,78 @@ +"; + print "
"; + + $result = db_query($this->link, "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 "

"; + + print " + + + + + + "; + + while ($line = db_fetch_assoc($result)) { + print ""; + + foreach ($line as $k => $v) { + $line[$k] = htmlspecialchars($v); + } + + print ""; + print ""; + print ""; + print ""; + + print ""; + + print ""; + } + + print "
".__("Error")."".__("Filename")."".__("Message")."".__("User")."".__("Date")."
" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" . $line["filename"] . ":" . $line["lineno"] . "" . $line["errstr"] . "" . + make_local_datetime($this->link, + $line["created_at"], false) . "
"; + + print "

"; + + global $pluginhost; + $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB, + "hook_prefs_tab", "prefSystem"); + + print ""; #container + } + +} +?> -- cgit v1.2.3 From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 16:23:15 +0400 Subject: remove $link --- classes/pref/system.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index 2957b7b96..0282b2d73 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -2,10 +2,6 @@ class Pref_System extends Handler_Protected { - function __construct($link, $args) { - parent::__construct($link, $args); - } - function before($method) { if (parent::before($method)) { if ($_SESSION["access_level"] < 10) { @@ -28,7 +24,7 @@ class Pref_System extends Handler_Protected { print "
"; print "
"; - $result = db_query($this->link, "SELECT errno, errstr, filename, lineno, + $result = db_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 @@ -57,7 +53,7 @@ class Pref_System extends Handler_Protected { print "" . $line["login"] . ""; print "" . - make_local_datetime($this->link, + make_local_datetime( $line["created_at"], false) . ""; print ""; -- cgit v1.2.3 From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 18:34:18 +0400 Subject: fix blank character after opening bracket in function calls --- classes/pref/system.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index 0282b2d73..6d44fd2ea 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -24,7 +24,7 @@ class Pref_System extends Handler_Protected { print "
"; print "
"; - $result = db_query( "SELECT errno, errstr, filename, lineno, + $result = db_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 -- cgit v1.2.3 From 01568557b5085e7943d196b919b46c94d6d04b5c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 19:00:15 +0400 Subject: log viewer: add refresh button --- classes/pref/system.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index 6d44fd2ea..23f5a4328 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -30,6 +30,9 @@ class Pref_System extends Handler_Protected { ORDER BY ttrss_error_log.id DESC LIMIT 100"); + print " "; + print "

"; print " -- cgit v1.2.3 From d9c85e0f112034ca3e3f4d34213f6dcccf9d54e1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 20:12:14 +0400 Subject: classes: use OO DB interface --- classes/pref/system.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index 23f5a4328..3d82b8fff 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -24,7 +24,7 @@ class Pref_System extends Handler_Protected { print "
"; print "
"; - $result = db_query("SELECT errno, errstr, filename, lineno, + $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 @@ -43,7 +43,7 @@ class Pref_System extends Handler_Protected {
"; - while ($line = db_fetch_assoc($result)) { + while ($line = $this->dbh->fetch_assoc($result)) { print ""; foreach ($line as $k => $v) { -- cgit v1.2.3 From 1ffe3391f902c4baa984982f19e61a0e45de21ff Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Apr 2013 12:27:34 +0400 Subject: make pluginhost a singleton --- classes/pref/system.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index 3d82b8fff..725c337dc 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -66,8 +66,7 @@ class Pref_System extends Handler_Protected { print ""; - global $pluginhost; - $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB, + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "hook_prefs_tab", "prefSystem"); print ""; #container -- cgit v1.2.3 From b367c951b990b38677e67f1a1756cd4d1eaee50b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Apr 2013 09:45:43 +0400 Subject: make logging configurable; add logging to syslog --- classes/pref/system.php | 75 +++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 34 deletions(-) (limited to 'classes/pref/system.php') 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 "
"; print "
"; - $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 " "; - - print "

".__("Date")."
"; - - print " - - - - - - "; - - while ($line = $this->dbh->fetch_assoc($result)) { - print ""; - - 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 " "; + + print "

".__("Error")."".__("Filename")."".__("Message")."".__("User")."".__("Date")."
"; + + print " + + + + + + "; + + while ($line = $this->dbh->fetch_assoc($result)) { + print ""; + + foreach ($line as $k => $v) { + $line[$k] = htmlspecialchars($v); + } + + print ""; + print ""; + print ""; + print ""; + + print ""; + + print ""; } - print ""; - print ""; - print ""; - print ""; + print "
".__("Error")."".__("Filename")."".__("Message")."".__("User")."".__("Date")."
" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" . $line["filename"] . ":" . $line["lineno"] . "" . $line["errstr"] . "" . + make_local_datetime( + $line["created_at"], false) . "
" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" . $line["filename"] . ":" . $line["lineno"] . "" . $line["errstr"] . "
"; + } else { - print "" . - make_local_datetime( - $line["created_at"], false) . ""; + print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging."); - print ""; } - print ""; - print "

"; PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, -- cgit v1.2.3 From 52e7b5a096f5d0d7724b6f1731559b237b2c47ae Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 29 Apr 2013 23:12:54 +0400 Subject: add clear sql log button --- classes/pref/system.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'classes/pref/system.php') diff --git a/classes/pref/system.php b/classes/pref/system.php index d2b6cd746..7accb1f91 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -19,6 +19,10 @@ class Pref_System extends Handler_Protected { return array_search($method, $csrf_ignored) !== false; } + function clearLog() { + $this->dbh->query("DELETE FROM ttrss_error_log"); + } + function index() { print "
"; @@ -35,6 +39,9 @@ class Pref_System extends Handler_Protected { print " "; + print "  "; + print "

"; print " -- cgit v1.2.3