Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query

[friendica.git] / src / Core / Update.php

diff --git a/src/Core/Update.php b/src/Core/Update.php
index b9f3f3d1c9fdc985ec9d83c570b1ee5dd0195f14..7b2624cb9c638ae67eda5cd7c73c0c1cc840d8ab 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -4,6 +4,7 @@ namespace Friendica\Core;
 
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\Util\Strings;
 
 class Update
 {
@@ -17,6 +18,10 @@ class Update
         */
        public static function check($via_worker)
        {
+               if (!DBA::connected()) {
+                       return;
+               }
+
                $build = Config::get('system', 'build');
 
                if (empty($build)) {
@@ -69,6 +74,8 @@ class Update
                        if ($stored < $current) {
                                Config::load('database');
 
+                               Logger::log('Update from \'' . $stored . '\'  to \'' . $current . '\' - starting', Logger::DEBUG);
+
                                // Compare the current structure with the defined structure
                                // If the Lock is acquired, never release it automatically to avoid double updates
                                if (Lock::acquire('dbupdate', 120, Cache::INFINITE)) {
@@ -90,11 +97,13 @@ class Update
                                                                $retval
                                                        );
                                                }
+                                               Logger::log('ERROR: Update from \'' . $stored . '\'  to \'' . $current . '\' - failed:  ' - $retval, Logger::ALL);
                                                Lock::release('dbupdate');
                                                return $retval;
                                        } else {
                                                Config::set('database', 'last_successful_update', $current);
                                                Config::set('database', 'last_successful_update_time', time());
+                                               Logger::log('Update from \'' . $stored . '\'  to \'' . $current . '\' - finished', Logger::DEBUG);
                                        }
 
                                        // run the update_nnnn functions in update.php
@@ -105,6 +114,7 @@ class Update
                                                }
                                        }
 
+                                       Logger::log('Update from \'' . $stored . '\'  to \'' . $current . '\' - successful', Logger::DEBUG);
                                        if ($sendMail) {
                                                self::updateSuccessfull($stored, $current);
                                        }
@@ -112,6 +122,8 @@ class Update
                                        Lock::release('dbupdate');
                                }
                        }
+               } elseif ($force) {
+                       DBStructure::update($verbose, true);
                }
 
                return '';
@@ -129,6 +141,8 @@ class Update
        {
                $funcname = $prefix . '_' . $x;
 
+               Logger::log('Update function \'' . $funcname . '\' - start', Logger::DEBUG);
+
                if (function_exists($funcname)) {
                        // There could be a lot of processes running or about to run.
                        // We want exactly one process to run the update command.
@@ -148,6 +162,7 @@ class Update
                                                $x,
                                                L10n::t('Update %s failed. See error logs.', $x)
                                        );
+                                       Logger::log('ERROR: Update function \'' . $funcname . '\' - failed: ' . $retval, Logger::ALL);
                                        Lock::release('dbupdate_function');
                                        return false;
                                } else {
@@ -159,6 +174,7 @@ class Update
                                        }
 
                                        Lock::release('dbupdate_function');
+                                       Logger::log('Update function \'' . $funcname . '\' - finished', Logger::DEBUG);
                                        return true;
                                }
                        }
@@ -200,7 +216,7 @@ class Update
                        $lang = (($admin['language'])?$admin['language']:'en');
                        L10n::pushLang($lang);
 
-                       $preamble = deindent(L10n::t("
+                       $preamble = Strings::deindent(L10n::t("
                                The friendica developers released update %s recently,
                                but when I tried to install it, something went terribly wrong.
                                This needs to be fixed soon and I can't do it alone. Please contact a
@@ -235,7 +251,7 @@ class Update
                                $lang = (($admin['language']) ? $admin['language'] : 'en');
                                L10n::pushLang($lang);
 
-                               $preamble = deindent(L10n::t("
+                               $preamble = Strings::deindent(L10n::t("
                                        The friendica database was successfully updated from %s to %s.",
                                        $from_build, $to_build));