Controllers/Cli/Install.php

@@ -62,7 +62,7 @@ class Install extends Cli\Controller implements Interfaces\CliControllerInterfac
 
  try {
  if ($installType == "all" || $installType == "cassandra") {
- $this->out('- Provisioning Cassandra: ', $this::OUTPUT_INLINE);
+ $this->out('- Provisioning Cassandra:',  $this::OUTPUT_INLINE);
  $isCleanCassandra = $this->getopt("cleanCassandra") != null;
  $provisioner->provisionCassandra(null, $isCleanCassandra);
  $this->out('OK');
@@ -71,35 +71,20 @@ class Install extends Cli\Controller implements Interfaces\CliControllerInterfac
  $provisioner->reloadStorage();
  $this->out('OK');
  }
- } catch (Exception $e) {
- // REVNOTE: This seems unused, currently. None of the database provisioners currently
- // throw ProvisionException. We should maybe catch general exceptions (log them) and continue,
- // and not ProvisionExceptions. I considered removing this altogether, but it is useful to continue
- // past server errors in an setup.
- if ($this->getOpt('graceful-storage-provision')) {
- $this->out($e->getMessage());
- $this->out('Error in cassandra setup. Continuing.');
- } else {
- throw $e;
- }
+ } catch (Exception $ex) {
+ $this->out('Something BAD happened while provisioning Cassandra' . $ex->getMessage()); 
  }
 
  try {
  if ($installType == "all" || $installType == "cockroach") {
- $this->out('- Provisioning Cockroach:', $this::OUTPUT_INLINE);
+ $this->out('- Provisioning Cockroach:');
  $isCleanCockroach = $this->getopt("cleanCockroach") != null;
  $provisioner->provisionCockroach(null, $isCleanCockroach);
  $this->out('OK');
  }
- } catch (Exception $e) {
- // See REVNOTE above.
- if ($this->getOpt('graceful-storage-provision')) {
- $this->out($e->getMessage());
- $this->out('Error in cockroach setup. Continuing.');
- } else {
- throw $e;
- }
- }
+ } catch (Exception $ex) {
+ $this->out('Something BAD happened while provisioning Cockroach' . $ex->getMessage()); 
+ } 
 
  if (($installType == "all") || ($installType == "site")) {
  $this->out('- Setting up site:', $this::OUTPUT_INLINE);

Core/Provisioner/Provisioners/CassandraProvisioner.php

@@ -38,7 +38,7 @@ class CassandraProvisioner implements ProvisionerInterface
  $client->execute($statement);
  }
  } catch (\Exception $e) {
- var_dump($e); exit;
+ error_log("Error provisioning cassandra: " . $e->getMessage());
  }
  
  return true;

Core/Provisioner/Provisioners/CockroachProvisioner.php

@@ -41,8 +41,12 @@ class CockroachProvisioner implements ProvisionerInterface
  if (trim($query) === '') {
  continue;
  }
- $statement = $adminDb->prepare($query);
- $statement->execute();
+ try {
+ $statement = $adminDb->prepare($query);
+ $statement->execute();
+ } catch (\Exception $ex) {
+ error_log("Error running cockroach statement: " . $ex->getMessage());
+ }
  }
  }
 }