Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Unix sockets #34

Merged
merged 1 commit into from Apr 4, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions examples/memcached_connect_socket.js
@@ -0,0 +1,5 @@
var nMemcached = require( '../' ),
memcached;

// connect to our memcached server listening on Unix socket /tmp/.memcached.sock
memcached = new nMemcached( '/tmp/.memcached.sock' );
14 changes: 8 additions & 6 deletions lib/memcached.js
@@ -1,5 +1,6 @@
var EventEmitter = require('events').EventEmitter
, Stream = require('net').Stream
, Socket = require('net').Socket
, Buffer = require('buffer').Buffer;

var HashRing = require('hashring')
Expand Down Expand Up @@ -94,14 +95,15 @@ Client.config = {
if (server in this.connections) return this.connections[server].allocate(callback);

// No connection factory created yet, so we must build one
var serverTokens = /(.*):(\d+){1,}$/.exec(server).reverse()
var serverTokens = server[0] === '/' ? server : /(.*):(\d+){1,}$/.exec(server).reverse()
, memcached = this;

serverTokens.pop();
// Pop original string from array
if (Array.isArray(serverTokens)) serverTokens.pop();

var sid = 0;
this.connections[server] = new Manager(server, this.poolSize, function(callback){
var S = new Stream
var S = Array.isArray(serverTokens) ? new Stream : new Socket
, Manager = this;

// config the Stream
Expand All @@ -112,7 +114,7 @@ Client.config = {
S.responseBuffer = "";
S.bufferArray = [];
S.serverAddress = server;
S.tokens = serverTokens;
S.tokens = [].concat(serverTokens);
S.memcached = memcached;

// Add the event listeners
Expand All @@ -125,8 +127,8 @@ Client.config = {
, end: S.end
});

// connect the net.Stream [port, hostname]
S.connect.apply(S, serverTokens);
// connect the net.Stream (or net.Socket) [port, hostname]
S.connect.apply(S, S.tokens);
return S;
});

Expand Down