Backport pull FRiCKLE#24; Socket support

Author: cryptofuture

Diff for: README.md

@@ -43,11 +43,11 @@ Configuration directives
 ========================
 postgres_server
 ---------------
-* **syntax**: `postgres_server ip[:port] dbname=dbname user=user password=pass`
+* **syntax**: `postgres_server {ip[:portnum]|unix:/socket/dir} [port=portnum] [dbname=dbname] [user=user] [password=pass]`
 * **default**: `none`
 * **context**: `upstream`
 
-Set details about the database server.
+Set details about the database server. Additional port parameter is offered to connect to unix socket with alternative port numbers.
 
 
 postgres_keepalive

Diff for: src/ngx_postgres_module.c

@@ -446,11 +446,19 @@ ngx_postgres_conf_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     pgs->addrs = u.addrs;
     pgs->naddrs = u.naddrs;
-    pgs->port = u.port;
+    pgs->port = u.family == AF_UNIX ? u.default_port : u.port;
+    pgs->family = u.family;
 
     /* parse various options */
     for (i = 2; i < cf->args->nelts; i++) {
 
+        if (ngx_strncmp(value[i].data, "port=", sizeof("port=") - 1)
+                == 0)
+        {
+            pgs->port = (in_port_t) ngx_atoi(&value[i].data[sizeof("port=") - 1], value[i].len - (sizeof("port=") - 1));
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "dbname=", sizeof("dbname=") - 1)
                 == 0)
         {

Diff for: src/ngx_postgres_module.h

@@ -112,6 +112,7 @@ typedef struct {
 #endif
     ngx_uint_t                          naddrs;
     in_port_t                           port;
+    int                                 family;
     ngx_str_t                           dbname;
     ngx_str_t                           user;
     ngx_str_t                           password;
@@ -123,6 +124,7 @@ typedef struct {
     ngx_str_t                           name;
     ngx_str_t                           host;
     in_port_t                           port;
+    int                                 family;
     ngx_str_t                           dbname;
     ngx_str_t                           user;
     ngx_str_t                           password;

Diff for: src/ngx_postgres_upstream.c

@@ -91,6 +91,7 @@ ngx_postgres_upstream_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *uscf)
             peers->peer[n].socklen = server[i].addrs[j].socklen;
             peers->peer[n].name = server[i].addrs[j].name;
             peers->peer[n].port = server[i].port;
+            peers->peer[n].family = server[i].family;
             peers->peer[n].dbname = server[i].dbname;
             peers->peer[n].user = server[i].user;
             peers->peer[n].password = server[i].password;
@@ -330,7 +331,10 @@ ngx_postgres_upstream_get_peer(ngx_peer_connection_t *pc, void *data)
     }
 
     /* sizeof("...") - 1 + 1 (for spaces and '\0' omitted */
+    /* we hope that unix sockets connection string will be always shorter than tcp/ip one (because 'host' is shorter than 'hostaddr') */
     len = sizeof("hostaddr=") + peer->host.len
+        + sizeof("port=") + sizeof("65535") - 1
+        + sizeof("dbname=") + peer->dbname.len
         + sizeof("port=") + sizeof("65535") - 1
         + sizeof("dbname=") + peer->dbname.len
         + sizeof("user=") + peer->user.len
@@ -347,12 +351,18 @@ ngx_postgres_upstream_get_peer(ngx_peer_connection_t *pc, void *data)
 #endif
     }
 
-    /* TODO add unix sockets */
-    last = ngx_snprintf(connstring, len - 1,
-                        "hostaddr=%V port=%d dbname=%V user=%V password=%V"
-                        " sslmode=disable",
-                        &peer->host, peer->port, &peer->dbname, &peer->user,
-                        &peer->password);
+    if(peer->family != AF_UNIX)
+        last = ngx_snprintf(connstring, len - 1,
+                            "hostaddr=%V port=%d dbname=%V user=%V password=%V"
+                            " sslmode=disable",
+                            &peer->host, peer->port, &peer->dbname, &peer->user,
+                            &peer->password);
+    else
+        last = ngx_snprintf(connstring, len - 1,
+                            "host=%s port=%d dbname=%V user=%V password=%V"
+                            " sslmode=disable",
+                            &peer->host.data[5], peer->port, &peer->dbname, &peer->user,
+                            &peer->password);
     *last = '\0';
 
     dd("PostgreSQL connection string: %s", connstring);