From b953f89241f30fd670e816f178d9ed4eb2264491 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 16 Sep 2013 22:18:37 +0200 Subject: [PATCH] Removed debug code --- .../files/acp/update_com.woltlab.wcf.b9.php | 5 ++--- .../PackageInstallationDispatcher.class.php | 16 ++-------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf.b9.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf.b9.php index ddd4cd2d90..7d431e3e69 100644 --- a/wcfsetup/install/files/acp/update_com.woltlab.wcf.b9.php +++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf.b9.php @@ -66,9 +66,8 @@ if ($commentUpdateData['count']) { } WCF::getSession()->register('__commentUpdateData', serialize($commentUpdateData)); -file_put_contents(WCF_DIR.'node.log', "SCRIPT executed, count is {$commentUpdateData['count']} and offset is {$commentUpdateData['offset']}\n", FILE_APPEND); + // force new execution of current node -if ($commentUpdateData['count'] <= $commentUpdateData['offset']) { - file_put_contents(WCF_DIR.'node.log', "\tSPLIT NODE\n", FILE_APPEND); +if ($commentUpdateData['count'] >= $commentUpdateData['offset']) { throw new SplitNodeException(); } diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php index 2168f7f82f..47f4aa1a5c 100644 --- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php @@ -127,8 +127,6 @@ class PackageInstallationDispatcher { public function install($node) { $nodes = $this->nodeBuilder->getNodeData($node); - file_put_contents(WCF_DIR.'node.log', "INSTALLING node {$node}\n", FILE_APPEND); - // invoke node-specific actions foreach ($nodes as $data) { $nodeData = unserialize($data['nodeData']); @@ -144,8 +142,6 @@ class PackageInstallationDispatcher { $step = $this->executePIP($nodeData); $end = round(microtime(true) - $start, 4); file_put_contents(WCF_DIR.'__installPerformance.log', "Executing PIP ".$nodeData['pip']."... {$end}\n", FILE_APPEND); - - file_put_contents(WCF_DIR.'node.log', "EXECUTING pip {$nodeData['pip']}\n", FILE_APPEND); break; case 'optionalPackages': @@ -158,7 +154,6 @@ class PackageInstallationDispatcher { } if ($step->splitNode()) { - file_put_contents(WCF_DIR.'node.log', "CLONING node {$node} with sequence no {$data['sequenceNo']}\n", FILE_APPEND); $this->nodeBuilder->cloneNode($node, $data['sequenceNo']); break; } @@ -171,7 +166,6 @@ class PackageInstallationDispatcher { $tmp = $node; $node = $this->nodeBuilder->getNextNode($node); $step->setNode($node); - file_put_contents(WCF_DIR.'node.log', "ASSIGNED new node {$node}, previous was {$tmp}\n", FILE_APPEND); // perform post-install/update actions if ($node == '') { @@ -237,13 +231,10 @@ class PackageInstallationDispatcher { } // delete queues - /* - * DEBUG ONLY - * $sql = "DELETE FROM wcf".WCF_N."_package_installation_queue WHERE processNo = ?"; $statement = WCF::getDB()->prepareStatement($sql); - $statement->execute(array($this->queue->processNo));*/ + $statement->execute(array($this->queue->processNo)); } if ($this->requireRestructureVersionTables) { @@ -882,13 +873,10 @@ class PackageInstallationDispatcher { } // delete queues - /* - * DEBUG ONLY - * $sql = "DELETE FROM wcf".WCF_N."_package_installation_queue WHERE processNo = ?"; $statement = WCF::getDB()->prepareStatement($sql); - $statement->execute(array($this->queue->processNo));*/ + $statement->execute(array($this->queue->processNo)); // clear language files once whole installation is completed LanguageEditor::deleteLanguageFiles(); -- 2.20.1