Peter M. Groen / knowledgetree

Commit 03558f82757c310b9ed1210dac813f154410837a

Authored by Jarrett Jordaan
1 parent e39ee10c

Ports updated for indexer. 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 1 changed file with 9 additions and 8 deletions
setup/wizard/steps/database.php
  View file @03558f8
... ... @@ -638,17 +638,20 @@ class database extends Step
638 638 $this->error['con'] = "Could not populate schema ";
639 639 }
640 640 $this->writeBinaries();
641   - $conf = $this->util->getDataFromSession('configuration');
642   - $port = $conf['server']['port'];
643   - $iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
  641 + $this->addServerPort();
644 642 $this->util->dbUtilities->query($iserverPorts);
645   - // ensure a guid was generated and is stored
646   - $this->util->getSystemIdentifier();
  643 + $this->util->getSystemIdentifier(); // ensure a guid was generated and is stored
647 644 $this->reBuildPaths();
648 645  
649 646 return true;
650 647 }
651 648  
  649 + private function addServerPort() {
  650 + $conf = $this->util->getDataFromSession('configuration');
  651 + $port = $conf['server']['port'];
  652 + $iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
  653 + }
  654 +
652 655 /**
653 656 * Create database
654 657 *
... ... @@ -771,9 +774,7 @@ class database extends Step
771 774 $this->parse_mysql_dump($sqlFile);
772 775 $dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
773 776 $this->util->dbUtilities->query($dropPluginHelper);
774   - $conf = $this->util->getDataFromSession('configuration');
775   - $port = $conf['server']['port'];
776   - $iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
  777 + $this->addServerPort();
777 778 $this->util->dbUtilities->query($iserverPorts);
778 779 $updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
779 780 $this->util->dbUtilities->query($updateExternalBinaries);
... ...