mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19879 from owncloud/oci-setup-static-to-object 

[OCI setup] remove static logger/config calls
This commit is contained in:
Thomas Müller 2015-10-20 09:47:59 +02:00
parent dfd44942c6 5944b33d56
commit a59ad87db8
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/private/setup/oci.php
View File

@ -40,7 +40,7 @@ class OCI extends AbstractDatabase {
// allow empty hostname for oracle // allow empty hostname for oracle
$this->dbHost = $config['dbhost']; $this->dbHost = $config['dbhost'];
\OC_Config::setValues([ $this->config->setSystemValues([
'dbhost' => $this->dbHost, 'dbhost' => $this->dbHost,
'dbtablespace' => $this->dbtablespace, 'dbtablespace' => $this->dbtablespace,
]); ]);
@ -66,7 +66,7 @@ class OCI extends AbstractDatabase {
} else { } else {
$easy_connect_string = '//'.$e_host.'/'.$e_dbname; $easy_connect_string = '//'.$e_host.'/'.$e_dbname;
} }
\OCP\Util::writeLog('setup oracle', 'connect string: ' . $easy_connect_string, \OCP\Util::DEBUG); $this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string); $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
if(!$connection) { if(!$connection) {
$errorMessage = $this->getLastError(); $errorMessage = $this->getLastError();
@ -93,7 +93,7 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
$result = oci_execute($stmt); $result = oci_execute($stmt);
if($result) { if($result) {
@ -116,7 +116,7 @@ class OCI extends AbstractDatabase {
} }
} }
\OC_Config::setValues([ $this->config->setSystemValues([
'dbuser' => $this->dbUser, 'dbuser' => $this->dbUser,
'dbname' => $this->dbName, 'dbname' => $this->dbName,
'dbpassword' => $this->dbPassword, 'dbpassword' => $this->dbPassword,
@ -131,9 +131,9 @@ class OCI extends AbstractDatabase {
oci_close($connection); oci_close($connection);
// connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled // connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
$this->dbUser = \OC_Config::getValue('dbuser'); $this->dbUser = $this->config->getSystemValue('dbuser');
//$this->dbname = \OC_Config::getValue('dbname'); //$this->dbname = \OC_Config::getValue('dbname');
$this->dbPassword = \OC_Config::getValue('dbpassword'); $this->dbPassword = $this->config->getSystemValue('dbpassword');
$e_host = addslashes($this->dbHost); $e_host = addslashes($this->dbHost);
$e_dbname = addslashes($this->dbName); $e_dbname = addslashes($this->dbName);
@ -155,7 +155,7 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning( $entry, ['app' => 'setup.oci']);
} }
$result = oci_execute($stmt); $result = oci_execute($stmt);
@ -178,14 +178,14 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
oci_bind_by_name($stmt, ':un', $name); oci_bind_by_name($stmt, ':un', $name);
$result = oci_execute($stmt); $result = oci_execute($stmt);
if(!$result) { if(!$result) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
if(! oci_fetch_row($stmt)) { if(! oci_fetch_row($stmt)) {
@ -196,7 +196,8 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
//oci_bind_by_name($stmt, ':un', $name); //oci_bind_by_name($stmt, ':un', $name);
$result = oci_execute($stmt); $result = oci_execute($stmt);
@ -204,7 +205,8 @@ class OCI extends AbstractDatabase {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s', $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
array($query, $name, $password)) . '<br />'; array($query, $name, $password)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
} else { // change password of the existing role } else { // change password of the existing role
$query = "ALTER USER :un IDENTIFIED BY :pw"; $query = "ALTER USER :un IDENTIFIED BY :pw";
@ -212,7 +214,7 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
oci_bind_by_name($stmt, ':un', $name); oci_bind_by_name($stmt, ':un', $name);
oci_bind_by_name($stmt, ':pw', $password); oci_bind_by_name($stmt, ':pw', $password);
@ -220,7 +222,7 @@ class OCI extends AbstractDatabase {
if(!$result) { if(!$result) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
} }
// grant necessary roles // grant necessary roles
@ -229,14 +231,14 @@ class OCI extends AbstractDatabase {
if (!$stmt) { if (!$stmt) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />'; $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
$result = oci_execute($stmt); $result = oci_execute($stmt);
if(!$result) { if(!$result) {
$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />'; $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s', $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
array($query, $name, $password)) . '<br />'; array($query, $name, $password)) . '<br />';
\OCP\Util::writeLog('setup.oci', $entry, \OCP\Util::WARN); $this->logger->warning($entry, ['app' => 'setup.oci']);
} }
} }