Permalink
Browse files

MDL-25910 custom socket location for postgresql driver, improved conf…

…ig-dist.php info
  • Loading branch information...
1 parent 79ac5a8 commit 3c1293fe970fa81a924f41ae1fcf73fa0ecd2785 @skodak skodak committed Jan 14, 2011
Showing with 10 additions and 4 deletions.
  1. +6 −3 config-dist.php
  2. +4 −1 lib/dml/pgsql_native_moodle_database.php
View
9 config-dist.php
@@ -50,9 +50,12 @@
// 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
View
5 lib/dml/pgsql_native_moodle_database.php
@@ -138,8 +138,11 @@ public function connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, array $dbop
// 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 = "";

0 comments on commit 3c1293f

Please sign in to comment.