From 3c1293fe970fa81a924f41ae1fcf73fa0ecd2785 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 14 Jan 2011 12:11:49 +0100 Subject: [PATCH] MDL-25910 custom socket location for postgresql driver, improved config-dist.php info --- config-dist.php | 9 ++++++--- lib/dml/pgsql_native_moodle_database.php | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config-dist.php b/config-dist.php index 66f6badc0ac..f9909be8915 100644 --- a/config-dist.php +++ b/config-dist.php @@ -50,9 +50,12 @@ $CFG->dboptions = array( // used? set to 'false' for the most stable // setting, 'true' can improve performance // sometimes - 'dbsocket' => false, // should connection via UNIX socket be - // used? if you set it to 'true' here, - // set dbhost to 'localhost' + 'dbsocket' => false, // should connection via UNIX socket be used? + // if you set it to 'true' or custom path + // here set dbhost to 'localhost', + // (please note mysql is always using socket + // if dbhost is 'localhost' - if you need + // local port connection use '127.0.0.1') 'dbport' => '', // the TCP port number to use when connecting // to the server. keep empty string for the // default port diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php index d78bf570160..030e9543a6b 100644 --- a/lib/dml/pgsql_native_moodle_database.php +++ b/lib/dml/pgsql_native_moodle_database.php @@ -138,8 +138,11 @@ class pgsql_native_moodle_database extends moodle_database { // Unix socket connections should have lower overhead if (!empty($this->dboptions['dbsocket']) and ($this->dbhost === 'localhost' or $this->dbhost === '127.0.0.1')) { $connection = "user='$this->dbuser' password='$pass' dbname='$this->dbname'"; + if (strpos($this->dboptions['dbsocket'], '/') !== false) { + $connection = $connection." host='".$this->dboptions['dbsocket']."'"; + } } else { - $this->dboptions['dbsocket'] = 0; + $this->dboptions['dbsocket'] = ''; if (empty($this->dbname)) { // probably old style socket connection - do not add port $port = "";