From: Roland Häder <Quix0r@users.noreply.github.com>
Date: Sun, 22 Jul 2018 18:07:44 +0000 (+0200)
Subject: Uncommon logger levels in Friendica (#5453)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c17adaf3333b356d0c7b19226b29cd733a43017b;p=friendica.git
Uncommon logger levels in Friendica (#5453)
* "normal" is an uncommon logger level:
- changed LOGGER_NORMAL -> LOGGER_INFO
- added LOGGER_WARNING (a common logger level)
* Used constants instead of values (MrPetovan)
---
diff --git a/boot.php b/boot.php
index 17caa19033..7654d261c3 100644
--- a/boot.php
+++ b/boot.php
@@ -113,11 +113,12 @@ define('SSL_POLICY_SELFSIGN', 2);
* log levels
* @{
*/
-define('LOGGER_NORMAL', 0);
-define('LOGGER_TRACE', 1);
-define('LOGGER_DEBUG', 2);
-define('LOGGER_DATA', 3);
-define('LOGGER_ALL', 4);
+define('LOGGER_WARNING', 0);
+define('LOGGER_INFO', 1);
+define('LOGGER_TRACE', 2);
+define('LOGGER_DEBUG', 3);
+define('LOGGER_DATA', 4);
+define('LOGGER_ALL', 5);
/* @}*/
/**
diff --git a/include/text.php b/include/text.php
index 6aa0c9d2dd..a7984a6146 100644
--- a/include/text.php
+++ b/include/text.php
@@ -513,7 +513,8 @@ $LOGGER_LEVELS = [];
* @brief Logs the given message at the given log level
*
* log levels:
- * LOGGER_NORMAL (default)
+ * LOGGER_WARNING
+ * LOGGER_INFO (default)
* LOGGER_TRACE
* LOGGER_DEBUG
* LOGGER_DATA
@@ -523,7 +524,7 @@ $LOGGER_LEVELS = [];
* @param string $msg
* @param int $level
*/
-function logger($msg, $level = 0) {
+function logger($msg, $level = LOGGER_INFO) {
$a = get_app();
global $LOGGER_LEVELS;
@@ -583,7 +584,8 @@ function logger($msg, $level = 0) {
* personally without background noise
*
* log levels:
- * LOGGER_NORMAL (default)
+ * LOGGER_WARNING
+ * LOGGER_INFO (default)
* LOGGER_TRACE
* LOGGER_DEBUG
* LOGGER_DATA
@@ -593,7 +595,7 @@ function logger($msg, $level = 0) {
* @param string $msg
* @param int $level
*/
-function dlogger($msg, $level = 0) {
+function dlogger($msg, $level = LOGGER_INFO) {
$a = get_app();
$logfile = Config::get('system', 'dlogfile');
diff --git a/mod/admin.php b/mod/admin.php
index 0576a1b247..3245cde0d7 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -2356,11 +2356,12 @@ function admin_page_logs_post(App $a)
function admin_page_logs(App $a)
{
$log_choices = [
- LOGGER_NORMAL => 'Normal',
- LOGGER_TRACE => 'Trace',
- LOGGER_DEBUG => 'Debug',
- LOGGER_DATA => 'Data',
- LOGGER_ALL => 'All'
+ LOGGER_WARNING => 'Warning',
+ LOGGER_INFO => 'Info',
+ LOGGER_TRACE => 'Trace',
+ LOGGER_DEBUG => 'Debug',
+ LOGGER_DATA => 'Data',
+ LOGGER_ALL => 'All'
];
if (ini_get('log_errors')) {
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 459dde8908..f0aee13405 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -142,7 +142,7 @@ class UserImport
// import user
$r = self::dbImportAssoc('user', $account['user']);
if ($r === false) {
- logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
notice(L10n::t("User creation error"));
return;
}
@@ -160,7 +160,7 @@ class UserImport
$profile['uid'] = $newuid;
$r = self::dbImportAssoc('profile', $profile);
if ($r === false) {
- logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
info(L10n::t("User profile creation error"));
DBA::delete('user', ['uid' => $newuid]);
return;
@@ -198,7 +198,7 @@ class UserImport
$contact['uid'] = $newuid;
$r = self::dbImportAssoc('contact', $contact);
if ($r === false) {
- logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
$errorcount++;
} else {
$contact['newid'] = self::lastInsertId();
@@ -212,7 +212,7 @@ class UserImport
$group['uid'] = $newuid;
$r = self::dbImportAssoc('group', $group);
if ($r === false) {
- logger("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
} else {
$group['newid'] = self::lastInsertId();
}
@@ -237,7 +237,7 @@ class UserImport
if ($import == 2) {
$r = self::dbImportAssoc('group_member', $group_member);
if ($r === false) {
- logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}
}
@@ -255,7 +255,7 @@ class UserImport
);
if ($r === false) {
- logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}
@@ -263,7 +263,7 @@ class UserImport
$pconfig['uid'] = $newuid;
$r = self::dbImportAssoc('pconfig', $pconfig);
if ($r === false) {
- logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_NORMAL);
+ logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index c6c8c15662..20865bfc4b 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -61,7 +61,7 @@ class DBStructure
// No valid result?
if (!DBM::is_result($adminlist)) {
- logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
+ logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_INFO);
// Don't continue
return;
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 92faba526e..3e8d99e7cb 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -134,7 +134,7 @@ class DFRN
);
if (! DBM::is_result($r)) {
- logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_NORMAL);
+ logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_WARNING);
killme();
}
@@ -170,7 +170,7 @@ class DFRN
);
if (! DBM::is_result($r)) {
- logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_NORMAL);
+ logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_WARNING);
killme();
}
diff --git a/src/Util/Network.php b/src/Util/Network.php
index aa118e3dd4..e9e318aa08 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -220,7 +220,7 @@ class Network
}
if (curl_errno($ch) !== CURLE_OK) {
- logger('error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
+ logger('error fetching ' . $url . ': ' . curl_error($ch), LOGGER_INFO);
}
$ret['errno'] = curl_errno($ch);