friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Adapt Logging messages

This commit is contained in:
Philipp Holzer 2019-03-11 21:36:41 +01:00
parent 8a358d5c98
commit cf17c72fd7
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Core/Update.php
View File

@ -83,7 +83,7 @@ class Update
if ($stored < $current || $force) { if ($stored < $current || $force) {
Config::load('database'); Config::load('database');
Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - starting', Logger::DEBUG); Logger::info('Update starting.', ['from' => $stored, 'to' => $current]);
// Compare the current structure with the defined structure // Compare the current structure with the defined structure
// If the Lock is acquired, never release it automatically to avoid double updates // If the Lock is acquired, never release it automatically to avoid double updates
@ -92,7 +92,7 @@ class Update
// Checks if the build changed during Lock acquiring (so no double update occurs) // Checks if the build changed during Lock acquiring (so no double update occurs)
$retryBuild = Config::get('system', 'build', null, true); $retryBuild = Config::get('system', 'build', null, true);
if ($retryBuild !== $build) { if ($retryBuild !== $build) {
Logger::debug('Update from \'' . $stored . '\' to \''. $current . '\' - already done'); Logger::info('Update already done.', ['from' => $stored, 'to' => $current]);
Lock::release('dbupdate'); Lock::release('dbupdate');
return ''; return '';
} }
@ -114,13 +114,13 @@ class Update
$retval $retval
); );
} }
Logger::log('ERROR: Update from \'' . $stored . '\' to \'' . $current . '\' - failed: ' - $retval, Logger::ALL); Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
Lock::release('dbupdate'); Lock::release('dbupdate');
return $retval; return $retval;
} else { } else {
Config::set('database', 'last_successful_update', $current); Config::set('database', 'last_successful_update', $current);
Config::set('database', 'last_successful_update_time', time()); Config::set('database', 'last_successful_update_time', time());
Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - finished', Logger::DEBUG); Logger::info('Update finished.', ['from' => $stored, 'to' => $current]);
} }
// run the update_nnnn functions in update.php // run the update_nnnn functions in update.php
@ -131,7 +131,7 @@ class Update
} }
} }
Logger::log('Update from \'' . $stored . '\' to \'' . $current . '\' - successful', Logger::DEBUG); Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
if ($sendMail) { if ($sendMail) {
self::updateSuccessfull($stored, $current); self::updateSuccessfull($stored, $current);
} }
@ -157,7 +157,7 @@ class Update
{ {
$funcname = $prefix . '_' . $x; $funcname = $prefix . '_' . $x;
Logger::log('Update function \'' . $funcname . '\' - start', Logger::DEBUG); Logger::info('Update function start.', ['function' => $funcname]);
if (function_exists($funcname)) { if (function_exists($funcname)) {
// There could be a lot of processes running or about to run. // There could be a lot of processes running or about to run.
@ -178,7 +178,7 @@ class Update
$x, $x,
L10n::t('Update %s failed. See error logs.', $x) L10n::t('Update %s failed. See error logs.', $x)
); );
Logger::log('ERROR: Update function \'' . $funcname . '\' - failed: ' . $retval, Logger::ALL); Logger::error('Update function ERROR.', ['function' => $funcname, 'retval' => $retval]);
Lock::release('dbupdate_function'); Lock::release('dbupdate_function');
return false; return false;
} else { } else {
@ -190,12 +190,12 @@ class Update
} }
Lock::release('dbupdate_function'); Lock::release('dbupdate_function');
Logger::log('Update function \'' . $funcname . '\' - finished', Logger::DEBUG); Logger::info('Update function finished.', ['function' => $funcname]);
return true; return true;
} }
} }
} else { } else {
Logger::log('Skipping \'' . $funcname . '\' without executing', Logger::DEBUG); Logger::info('Update function skipped.', ['function' => $funcname]);
Config::set('database', 'last_successful_update_function', $funcname); Config::set('database', 'last_successful_update_function', $funcname);
Config::set('database', 'last_successful_update_function_time', time()); Config::set('database', 'last_successful_update_function_time', time());
@ -222,7 +222,7 @@ class Update
// No valid result? // No valid result?
if (!DBA::isResult($adminlist)) { if (!DBA::isResult($adminlist)) {
Logger::log(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), Logger::INFO); Logger::warning('Cannot notify administrators .', ['update' => $update_id, 'message' => $error_message]);
// Don't continue // Don't continue
return; return;
@ -260,7 +260,7 @@ class Update
} }
//try the logger //try the logger
Logger::log("CRITICAL: Database structure update failed: " . $error_message); Logger::alert('Database structure update FAILED.', ['error' => $error_message]);
} }
private static function updateSuccessfull($from_build, $to_build) private static function updateSuccessfull($from_build, $to_build)
@ -299,6 +299,6 @@ class Update
} }
//try the logger //try the logger
Logger::log("Database structure update successful.", Logger::TRACE); Logger::debug('Database structure update successful.');
} }
} }