0
@@ -13,6 +13,10 @@ module Ebb
0
       fd = options[:fileno].to_i
0
       FFI::server_listen_on_fd(fd)
0
       log.puts "Ebb is listening on file descriptor #{fd}"
0
+    elsif options.has_key?(:unix_socket)
0
+      socketfile = options[:unix_socket]
0
+      FFI::server_listen_on_unix_socket(socketfile)
0
+      log.puts "Ebb is listening on unix socket #{socketfile}"
0
     else
0
       port = (options[:port] || 4001).to_i
0
       FFI::server_listen_on_port(port)

0
@@ -29,7 +29,6 @@
0
 #define min(a,b) (a < b ? a : b)
0
 #define ramp(a) (a > 0 ? a : 0)
0
 
0
-static int server_socket_unix(const char *path, int access_mask);
0
 static void client_init(ebb_client *client);
0
 
0
 static void set_nonblock(int fd)
0
@@ -469,29 +468,43 @@ void ebb_server_unlisten(ebb_server *server)
0
     ebb_client *client;
0
     ev_io_stop(server->loop, &server->request_watcher);
0
     close(server->fd);
0
-    if(server->socketpath)
0
+    if(server->socketpath) {
0
       unlink(server->socketpath);
0
+      server->socketpath = NULL;
0
+    }
0
+    if(server->port) {
0
+      free(server->port);
0
+      server->port = NULL;
0
+    }
0
     server->open = FALSE;
0
   }
0
 }
0
 
0
+
0
 int ebb_server_listen_on_fd(ebb_server *server, const int sfd)
0
 {
0
   set_nonblock(sfd);
0
-
0
+  
0
+  if (listen(sfd, EBB_MAX_CLIENTS) < 0) {
0
+    perror("listen()");
0
+    return -1;
0
+  }
0
+  
0
   server->fd = sfd;
0
-  server->port = NULL;
0
+  assert(server->port == NULL);
0
+  assert(server->socketpath == NULL);
0
   assert(server->open == FALSE);
0
   server->open = TRUE;
0
-
0
+  
0
   server->request_watcher.data = server;
0
   ev_init (&server->request_watcher, on_request);
0
   ev_io_set (&server->request_watcher, server->fd, EV_READ | EV_ERROR);
0
   ev_io_start (server->loop, &server->request_watcher);
0
-
0
+  
0
   return server->fd;
0
 }
0
 
0
+
0
 int ebb_server_listen_on_port(ebb_server *server, const int port)
0
 {
0
   int sfd = -1;
0
@@ -504,8 +517,6 @@ int ebb_server_listen_on_port(ebb_server *server, const int port)
0
     goto error;
0
   }
0
   
0
-  set_nonblock(sfd);
0
-  
0
   flags = 1;
0
   setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
   setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
0
@@ -526,15 +537,64 @@ int ebb_server_listen_on_port(ebb_server *server, const int port)
0
     perror("bind()");
0
     goto error;
0
   }
0
-  if (listen(sfd, EBB_MAX_CLIENTS) < 0) {
0
-    perror("listen()");
0
+  
0
+  int ret = ebb_server_listen_on_fd(server, sfd);
0
+  if (ret >= 0) {
0
+    assert(server->port == NULL);
0
+    server->port = malloc(sizeof(char)*8); /* for easy access to the port */
0
+    sprintf(server->port, "%d", port);
0
+  }
0
+  return ret;
0
+error:
0
+  if(sfd > 0) close(sfd);
0
+  return -1;
0
+}
0
+
0
+
0
+int ebb_server_listen_on_unix_socket(ebb_server *server, const char *socketpath)
0
+{
0
+  int sfd = -1;
0
+  struct linger ling = {0, 0};
0
+  struct sockaddr_un addr;
0
+  struct stat tstat;
0
+  int flags =1;
0
+  int old_umask = -1;
0
+  int access_mask = 0777;
0
+  
0
+  if(( sfd = socket(AF_UNIX, SOCK_STREAM, 0) ) == -1) {
0
+    perror("socket()");
0
     goto error;
0
   }
0
+  
0
+  /* Clean up a previous socket file if we left it around */
0
+  if(lstat(socketpath, &tstat) == 0 && S_ISSOCK(tstat.st_mode))
0
+    unlink(socketpath);
0
+  
0
+  flags = 1;
0
+  setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
+  setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
0
+  setsockopt(sfd, SOL_SOCKET, SO_LINGER, (void *)&ling, sizeof(ling));
0
 
0
+  /*
0
+   * the memset call clears nonstandard fields in some impementations
0
+   * that otherwise mess things up.
0
+   */
0
+  memset(&addr, 0, sizeof(addr));
0
+  
0
+  addr.sun_family = AF_UNIX;
0
+  strcpy(addr.sun_path, socketpath);
0
+  old_umask = umask( ~(access_mask & 0777) );
0
+  
0
+  if( bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
+    perror("bind()");
0
+    goto error;
0
+  }
0
+  umask(old_umask);
0
+  
0
   int ret = ebb_server_listen_on_fd(server, sfd);
0
   if (ret >= 0) {
0
-    server->port = malloc(sizeof(char)*8); /* for easy access to the port */
0
-    sprintf(server->port, "%d", port);
0
+    assert(server->socketpath == NULL);
0
+    server->socketpath = strdup(socketpath);
0
   }
0
   return ret;
0
 error:
0
@@ -543,14 +603,12 @@ error:
0
 }
0
 
0
 
0
-int ebb_server_listen_on_socket(ebb_server *server, const char *socketpath)
0
+int ebb_server_clients_in_use_p(ebb_server *server)
0
 {
0
-  // int fd = server_socket_unix(socketpath, 0755);
0
-  // if(fd < 0) return 0;
0
-  // server->socketpath = strdup(socketpath);
0
-  // server->fd = fd;
0
-  // server_listen(server);
0
-  // return fd;
0
+  int i;
0
+  for(i = 0; i < EBB_MAX_CLIENTS; i++)
0
+    if(server->clients[i].in_use) return TRUE;
0
+  return FALSE;
0
 }
0
 
0
 
0
@@ -669,68 +727,4 @@ int ebb_client_read(ebb_client *client, char *buffer, int length)
0
     client->nread_from_body += read;
0
     return read;
0
   }
0
-}
0
-
0
-/* The following socket creation routines are modified and stolen from memcached */
0
-
0
-
0
-static int server_socket_unix(const char *path, int access_mask) {
0
-    int sfd;
0
-    struct linger ling = {0, 0};
0
-    struct sockaddr_un addr;
0
-    struct stat tstat;
0
-    int flags =1;
0
-    int old_umask;
0
-
0
-    if (!path) {
0
-        return -1;
0
-    }
0
-    
0
-    if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
0
-        perror("socket()");
0
-        return -1;
0
-    }
0
-    
0
-    if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 ||
0
-        fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) {
0
-        perror("setting O_NONBLOCK");
0
-        close(sfd);
0
-        return -1;
0
-    }
0
-    
0
-    /*
0
-     * Clean up a previous socket file if we left it around
0
-     */
0
-    if (lstat(path, &tstat) == 0) {
0
-        if (S_ISSOCK(tstat.st_mode))
0
-            unlink(path);
0
-    }
0
-
0
-    flags = 1;
0
-    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
-    setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
0
-    setsockopt(sfd, SOL_SOCKET, SO_LINGER, (void *)&ling, sizeof(ling));
0
-
0
-    /*
0
-     * the memset call clears nonstandard fields in some impementations
0
-     * that otherwise mess things up.
0
-     */
0
-    memset(&addr, 0, sizeof(addr));
0
-
0
-    addr.sun_family = AF_UNIX;
0
-    strcpy(addr.sun_path, path);
0
-    old_umask=umask( ~(access_mask&0777));
0
-    if (bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
-        perror("bind()");
0
-        close(sfd);
0
-        umask(old_umask);
0
-        return -1;
0
-    }
0
-    umask(old_umask);
0
-    if (listen(sfd, EBB_MAX_CLIENTS) == -1) {
0
-        perror("listen()");
0
-        close(sfd);
0
-        return -1;
0
-    }
0
-    return sfd;
0
-}
0
+}
0
\ No newline at end of file

0
@@ -83,8 +83,9 @@ void ebb_server_init( ebb_server *server
0
                     );
0
 int ebb_server_listen_on_fd(ebb_server*, const int sfd);
0
 int ebb_server_listen_on_port(ebb_server*, const int port);
0
-int ebb_server_listen_on_socket(ebb_server*, const char *socketpath);
0
+int ebb_server_listen_on_unix_socket(ebb_server*, const char *socketpath);
0
 void ebb_server_unlisten(ebb_server*);
0
+int ebb_server_clients_in_use_p(ebb_server*);
0
 
0
 struct ebb_server {
0
   EBB_TCP_COMMON

0
@@ -57,13 +57,6 @@ static void detach_idle_watcher()
0
   ev_idle_stop(loop, &idle_watcher);
0
 }
0
 
0
-static int clients_in_use_p()
0
-{
0
-  int i;
0
-  for(i = 0; i < EBB_MAX_CLIENTS; i++)
0
-    if(server->clients[i].in_use) return TRUE;
0
-  return FALSE;
0
-}
0
 
0
 void request_cb(ebb_client *client, void *data)
0
 {
0
@@ -86,6 +79,14 @@ VALUE server_listen_on_port(VALUE _, VALUE port)
0
   return Qnil;
0
 }
0
 
0
+VALUE server_listen_on_unix_socket(VALUE _, VALUE socketfile)
0
+{
0
+  if(ebb_server_listen_on_unix_socket(server, StringValuePtr(socketfile)) < 0)
0
+    rb_sys_fail("Problem listening on unix socket");
0
+  return Qnil;
0
+}
0
+
0
+
0
 static struct timeval idle_timeout = { tv_sec: 0, tv_usec: 50000 };
0
 
0
 static void
0
@@ -96,7 +97,7 @@ idle_cb (struct ev_loop *loop, struct ev_idle *w, int revents) {
0
    * this hacky idle_cb
0
    */
0
   
0
-  if(clients_in_use_p()) {
0
+  if(ebb_server_clients_in_use_p(server)) {
0
     /* If ruby has control of any clients - that means there are some requests
0
      * still being processed inside of threads. We need to allow Ruby some
0
      * time to work on these threads so we call rb_thread_schedule()
0
@@ -296,6 +297,7 @@ void Init_ebb_ext()
0
   rb_define_singleton_method(mFFI, "server_process_connections", server_process_connections, 0);
0
   rb_define_singleton_method(mFFI, "server_listen_on_fd", server_listen_on_fd, 1);
0
   rb_define_singleton_method(mFFI, "server_listen_on_port", server_listen_on_port, 1);
0
+  rb_define_singleton_method(mFFI, "server_listen_on_unix_socket", server_listen_on_unix_socket, 1);
0
   rb_define_singleton_method(mFFI, "server_unlisten", server_unlisten, 0);
0
   rb_define_singleton_method(mFFI, "server_open?", server_open, 0);
0
   rb_define_singleton_method(mFFI, "server_waiting_clients", server_waiting_clients, 0);

0
@@ -1,6 +1,6 @@
0
 require File.dirname(__FILE__) + '/helper'
0
 
0
-class BasicTest < ServerTest
0
+module BasicTests
0
   def test_get_bytes
0
     [1,10,1000].each do |i|
0
       response = get("/bytes/#{i}")
0
@@ -27,3 +27,20 @@ class BasicTest < ServerTest
0
     end
0
   end
0
 end
0
+
0
+class BasicTest < ServerTest
0
+  include BasicTests
0
+end
0
+
0
+class BasicTestFD < ServerTestFD
0
+  include BasicTests
0
+end
0
+
0
+class BasicTestUnixSocket < ServerTestSocket
0
+  include BasicTests
0
+  
0
+  def test_socket_file_exists
0
+    assert File.exists?(@socketfile)
0
+    assert File.readable?(@socketfile)
0
+  end
0
+end
0
\ No newline at end of file

0
@@ -1,29 +0,0 @@
0
-require File.dirname(__FILE__) + '/helper'
0
-
0
-class BasicTestFD < ServerTestFD
0
-  def test_get_bytes
0
-    [1,10,1000].each do |i|
0
-      response = get("/bytes/#{i}")
0
-      assert_equal "#{'C'*i.to_i}", response['output']
0
-    end
0
-  end
0
-  
0
-  def test_get_unknown
0
-    response = get('/blah')
0
-    assert_equal "Undefined url", response['output']
0
-  end
0
-  
0
-  def test_small_posts
0
-    [1,10,321,123,1000].each do |i|
0
-      response = post("/test_post_length", 'C'*i)
0
-      assert_equal 200, response['status']
0
-    end
0
-  end
0
-  
0
-  def test_large_post
0
-    [50,60,100].each do |i|
0
-      response = post("/test_post_length", 'C'*1024*i)
0
-      assert_equal 200, response['status']
0
-    end
0
-  end
0
-end

0
@@ -98,3 +98,27 @@ class ServerTestFD < ServerTest
0
   end
0
 end
0
 
0
+class ServerTestSocket < ServerTest
0
+  def get(path)
0
+    socket = UNIXSocket.open(@socketfile)
0
+    socket.write("GET #{path} HTTP/1.0\r\n")
0
+    response = ""
0
+    while chunk = socket.recv(100)
0
+      response << chunk
0
+    end
0
+    env = JSON.parse(response)
0
+  ensure
0
+    socket.close if socket
0
+  end
0
+  
0
+  def setup
0
+    @socketfile = '/tmp/ebb_socket.sock'
0
+    Thread.new { Ebb.start_server(HelperApp.new, :unix_socket => @socketfile) }
0
+    sleep 0.1 until Ebb.running?
0
+  end
0
+
0
+  def teardown
0
+    super
0
+  end
0
+end
0
+